diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp index e3a1decbf6..52f3b43deb 100644 --- a/Source/Core/Core/HLE/HLE_OS.cpp +++ b/Source/Core/Core/HLE/HLE_OS.cpp @@ -215,8 +215,8 @@ namespace class HLEPrintArgsVAList final : public HLEPrintArgs { public: - HLEPrintArgsVAList(const Core::CPUThreadGuard& guard, HLE::SystemVABI::VAList* va_list) - : m_guard(guard), m_va_list(va_list) + HLEPrintArgsVAList(const Core::CPUThreadGuard& guard, HLE::SystemVABI::VAList* list) + : m_guard(guard), m_va_list(list) { } @@ -305,15 +305,15 @@ std::string GetStringVA(HLEPrintArgs* args, std::string_view string) if (string[i] == '*') { ++i; - const s32 result = Common::BitCast(args->GetU32()); - if (result >= 0) - return static_cast(result); + const s32 result_tmp = Common::BitCast(args->GetU32()); + if (result_tmp >= 0) + return static_cast(result_tmp); if (left_justified_flag_ptr) { // field width; this results in positive field width and left_justified flag set *left_justified_flag_ptr = true; - return static_cast(-static_cast(result)); + return static_cast(-static_cast(result_tmp)); } // precision; this is ignored @@ -329,10 +329,10 @@ std::string GetStringVA(HLEPrintArgs* args, std::string_view string) ++start; if (start == i) return 0; - u32 result = 0; + u32 result_tmp = 0; const std::string tmp(string, start, i - start); - if (TryParse(tmp, &result, 10)) - return result; + if (TryParse(tmp, &result_tmp, 10)) + return result_tmp; } return std::nullopt; diff --git a/Source/Core/Core/WC24PatchEngine.cpp b/Source/Core/Core/WC24PatchEngine.cpp index b88ca5cb6a..1fd7462b77 100644 --- a/Source/Core/Core/WC24PatchEngine.cpp +++ b/Source/Core/Core/WC24PatchEngine.cpp @@ -116,8 +116,8 @@ void Reload() std::optional GetNetworkPatch(const std::string& source, IsKD is_kd) { const auto patch = - std::find_if(s_patches.begin(), s_patches.end(), [&source, &is_kd](NetworkPatch& patch) { - return patch.source == source && patch.is_kd == is_kd && patch.enabled; + std::find_if(s_patches.begin(), s_patches.end(), [&source, &is_kd](const NetworkPatch& p) { + return p.source == source && p.is_kd == is_kd && p.enabled; }); if (patch == s_patches.end()) return std::nullopt; diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp b/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp index 5d12649be4..3f7bed01c8 100644 --- a/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp +++ b/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp @@ -31,8 +31,8 @@ ConfigFloatSlider::ConfigFloatSlider(float minimum, float maximum, setFont(bf); const QSignalBlocker blocker(this); - const int current_value = std::round((Config::Get(m_setting) - m_minimum) / m_step); - setValue(current_value); + const int value = std::round((Config::Get(m_setting) - m_minimum) / m_step); + setValue(value); }); } diff --git a/Source/Core/VideoCommon/LightingShaderGen.cpp b/Source/Core/VideoCommon/LightingShaderGen.cpp index 646f7277b5..4fb2c98ebd 100644 --- a/Source/Core/VideoCommon/LightingShaderGen.cpp +++ b/Source/Core/VideoCommon/LightingShaderGen.cpp @@ -214,43 +214,44 @@ void GenerateCustomLightingHeaderDetails(ShaderCode* out, u32 enablelighting, u3 out->Write("\tint light_count;\n"); } +static void GenerateLighting(ShaderCode* out, const LightingUidData& uid_data, int index, + int litchan_index, u32 channel_index, u32 custom_light_index, + bool alpha) +{ + const auto attnfunc = + static_cast((uid_data.attnfunc >> (2 * litchan_index)) & 0x3); + + const std::string_view light_type = alpha ? "alpha" : "color"; + const std::string name = fmt::format("lights_chan{}_{}", channel_index, light_type); + + out->Write("\t{{\n"); + out->Write("\t\tcustom_data.{}[{}].direction = " LIGHT_DIR ".xyz;\n", name, custom_light_index, + LIGHT_DIR_PARAMS(index)); + out->Write("\t\tcustom_data.{}[{}].position = " LIGHT_POS ".xyz;\n", name, custom_light_index, + LIGHT_POS_PARAMS(index)); + out->Write("\t\tcustom_data.{}[{}].cosatt = " LIGHT_COSATT ";\n", name, custom_light_index, + LIGHT_COSATT_PARAMS(index)); + out->Write("\t\tcustom_data.{}[{}].distatt = " LIGHT_DISTATT ";\n", name, custom_light_index, + LIGHT_DISTATT_PARAMS(index)); + out->Write("\t\tcustom_data.{}[{}].attenuation_type = {};\n", name, custom_light_index, + static_cast(attnfunc)); + if (alpha) + { + out->Write("\t\tcustom_data.{}[{}].color = float3(" LIGHT_COL + ") / float3(255.0, 255.0, 255.0);\n", + name, custom_light_index, LIGHT_COL_PARAMS(index, alpha ? "a" : "rgb")); + } + else + { + out->Write("\t\tcustom_data.{}[{}].color = " LIGHT_COL " / float3(255.0, 255.0, 255.0);\n", + name, custom_light_index, LIGHT_COL_PARAMS(index, alpha ? "a" : "rgb")); + } + out->Write("\t}}\n"); +} + void GenerateCustomLightingImplementation(ShaderCode* out, const LightingUidData& uid_data, std::string_view in_color_name) { - auto generate_lighting = [](ShaderCode* out, const LightingUidData& uid_data, int index, - int litchan_index, u32 channel_index, u32 custom_light_index, - bool alpha) { - const auto attnfunc = - static_cast((uid_data.attnfunc >> (2 * litchan_index)) & 0x3); - - const std::string_view light_type = alpha ? "alpha" : "color"; - const std::string name = fmt::format("lights_chan{}_{}", channel_index, light_type); - - out->Write("\t{{\n"); - out->Write("\t\tcustom_data.{}[{}].direction = " LIGHT_DIR ".xyz;\n", name, custom_light_index, - LIGHT_DIR_PARAMS(index)); - out->Write("\t\tcustom_data.{}[{}].position = " LIGHT_POS ".xyz;\n", name, custom_light_index, - LIGHT_POS_PARAMS(index)); - out->Write("\t\tcustom_data.{}[{}].cosatt = " LIGHT_COSATT ";\n", name, custom_light_index, - LIGHT_COSATT_PARAMS(index)); - out->Write("\t\tcustom_data.{}[{}].distatt = " LIGHT_DISTATT ";\n", name, custom_light_index, - LIGHT_DISTATT_PARAMS(index)); - out->Write("\t\tcustom_data.{}[{}].attenuation_type = {};\n", name, custom_light_index, - static_cast(attnfunc)); - if (alpha) - { - out->Write("\t\tcustom_data.{}[{}].color = float3(" LIGHT_COL - ") / float3(255.0, 255.0, 255.0);\n", - name, custom_light_index, LIGHT_COL_PARAMS(index, alpha ? "a" : "rgb")); - } - else - { - out->Write("\t\tcustom_data.{}[{}].color = " LIGHT_COL " / float3(255.0, 255.0, 255.0);\n", - name, custom_light_index, LIGHT_COL_PARAMS(index, alpha ? "a" : "rgb")); - } - out->Write("\t}}\n"); - }; - for (u32 i = 0; i < 8; i++) { for (u32 channel_index = 0; channel_index < NUM_XF_COLOR_CHANNELS; channel_index++) @@ -330,7 +331,7 @@ void GenerateCustomLightingImplementation(ShaderCode* out, const LightingUidData { if ((uid_data.light_mask & (1 << (i + 8 * j))) != 0) { - generate_lighting(out, uid_data, i, j, j, light_count, false); + GenerateLighting(out, uid_data, i, j, j, light_count, false); light_count++; } } @@ -344,7 +345,7 @@ void GenerateCustomLightingImplementation(ShaderCode* out, const LightingUidData { if ((uid_data.light_mask & (1 << (i + 8 * (j + 2)))) != 0) { - generate_lighting(out, uid_data, i, j + 2, j, light_count, true); + GenerateLighting(out, uid_data, i, j + 2, j, light_count, true); light_count++; } }