more removals + clang fixes

This commit is contained in:
georgemoralis 2026-01-09 16:38:16 +02:00
parent aaa9cb9cdb
commit 4cc35755e1
5 changed files with 6 additions and 28 deletions

View File

@ -143,8 +143,6 @@ static ConfigEntry<std::array<std::string, 4>> userNames({
"shadPS4-4",
});
// Input
static ConfigEntry<bool> isMotionControlsEnabled(true);
static ConfigEntry<bool> useUnifiedInputConfig(true);
// Debug
@ -165,7 +163,6 @@ static bool overrideControllerColor = false;
static int controllerCustomColorRGB[3] = {0, 0, 255};
static bool load_auto_patches = true;
bool GetUseUnifiedInputConfig() {
return useUnifiedInputConfig.get();
}
@ -200,7 +197,6 @@ void setTrophyKey(string key) {
trophyKey = key;
}
void setUserName(int id, string name) {
auto temp = userNames.get();
temp[id] = name;
@ -215,10 +211,6 @@ std::string getUserName(int id) {
return userNames.get()[id];
}
bool getIsMotionControlsEnabled() {
return isMotionControlsEnabled.get();
}
bool fpsColor() {
return isFpsColor.get();
}
@ -235,11 +227,6 @@ void setLanguage(u32 language, bool is_game_specific) {
m_language.set(language, is_game_specific);
}
void setIsMotionControlsEnabled(bool use, bool is_game_specific) {
isMotionControlsEnabled.set(use, is_game_specific);
}
u32 GetLanguage() {
return m_language.get();
}
@ -280,7 +267,6 @@ void load(const std::filesystem::path& path, bool is_game_specific) {
if (data.contains("Input")) {
const toml::value& input = data.at("Input");
isMotionControlsEnabled.setFromToml(input, "isMotionControlsEnabled", is_game_specific);
useUnifiedInputConfig.setFromToml(input, "useUnifiedInputConfig", is_game_specific);
}
@ -363,10 +349,6 @@ void save(const std::filesystem::path& path, bool is_game_specific) {
// Entries saved by the game-specific settings GUI
userNames.setTomlValue(data, "General", "userNames", is_game_specific);
isMotionControlsEnabled.setTomlValue(data, "Input", "isMotionControlsEnabled",
is_game_specific);
m_language.setTomlValue(data, "Settings", "consoleLanguage", is_game_specific);
if (!is_game_specific) {
@ -397,8 +379,6 @@ void setDefaultValues(bool is_game_specific) {
// GS - General
userNames.setDefault(is_game_specific);
// GS - Input
isMotionControlsEnabled.setDefault(is_game_specific);
// GS - Settings
m_language.setDefault(is_game_specific);

View File

@ -28,11 +28,9 @@ std::string getTrophyKey();
void setTrophyKey(std::string key);
u32 GetLanguage();
void setLanguage(u32 language, bool is_game_specific = false);
bool fpsColor(); // no set
bool fpsColor(); // no set
bool getShowFpsCounter();
void setShowFpsCounter(bool enable, bool is_game_specific = false);
bool getIsMotionControlsEnabled();
void setIsMotionControlsEnabled(bool use, bool is_game_specific = false);
void setUserName(const std::string& name, bool is_game_specific = false);
bool getLoadAutoPatches();
void setLoadAutoPatches(bool enable);

View File

@ -450,7 +450,7 @@ public:
SETTING_FORWARD_BOOL(m_input, MotionControlsEnabled, motion_controls_enabled)
SETTING_FORWARD_BOOL(m_input, BackgroundControllerInput, background_controller_input)
SETTING_FORWARD(m_input, DefaultControllerId, default_controller_id)
SETTING_FORWARD_BOOL(m_input, UsingSpecialPad,use_special_pad)
SETTING_FORWARD_BOOL(m_input, UsingSpecialPad, use_special_pad)
SETTING_FORWARD(m_input, SpecialPadClass, special_pad_class)
// Vulkan settings

View File

@ -6,13 +6,13 @@
#include "common/debug.h"
#include "common/thread.h"
#include "core/debug_state.h"
#include "core/emulator_settings.h"
#include "core/libraries/kernel/time.h"
#include "core/libraries/videoout/driver.h"
#include "core/libraries/videoout/videoout_error.h"
#include "imgui/renderer/imgui_core.h"
#include "video_core/amdgpu/liverpool.h"
#include "video_core/renderer_vulkan/vk_presenter.h"
#include "core/emulator_settings.h"
extern std::unique_ptr<Vulkan::Presenter> presenter;
extern std::unique_ptr<AmdGpu::Liverpool> liverpool;
@ -268,7 +268,8 @@ void VideoOutDriver::SubmitFlipInternal(VideoOutPort* port, s32 index, s64 flip_
}
void VideoOutDriver::PresentThread(std::stop_token token) {
const std::chrono::nanoseconds vblank_period(1000000000 / EmulatorSettings::GetInstance()->GetVblankFrequency());
const std::chrono::nanoseconds vblank_period(
1000000000 / EmulatorSettings::GetInstance()->GetVblankFrequency());
Common::SetCurrentThreadName("shadPS4:PresentThread");
Common::SetCurrentThreadRealtime(vblank_period);

View File

@ -397,8 +397,7 @@ bool ProcessEvent(const SDL_Event* event) {
if (mouse_pos.x != bd->prev_mouse_pos.x || mouse_pos.y != bd->prev_mouse_pos.y) {
bd->prev_mouse_pos.x = mouse_pos.x;
bd->prev_mouse_pos.y = mouse_pos.y;
if (EmulatorSettings::GetInstance()->GetCursorState() ==
HideCursorState::Idle) {
if (EmulatorSettings::GetInstance()->GetCursorState() == HideCursorState::Idle) {
bd->lastCursorMoveTime = bd->time;
}
}