From 9472da788d1f455ffa1ebf2debb3006ec3a042d0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 16:14:10 -0500 Subject: [PATCH 1/2] ConfigFloatSlider: Resolve -Wreorder warnings Orders the initializer list the way that the members would actually be initialized in. Resolves some -Wreorder warnings --- .../Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp b/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp index f881f6653f..5d12649be4 100644 --- a/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp +++ b/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp @@ -11,7 +11,7 @@ ConfigFloatSlider::ConfigFloatSlider(float minimum, float maximum, const Config::Info& setting, float step) - : ToolTipSlider(Qt::Horizontal), m_minimum(minimum), m_setting(setting), m_step(step) + : ToolTipSlider(Qt::Horizontal), m_minimum(minimum), m_step(step), m_setting(setting) { const float range = maximum - minimum; const int steps = std::round(range / step); From 2b2ee61e79d8be756909bbbc94bcd1737dac6abe Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 16:57:43 -0500 Subject: [PATCH 2/2] CustomShaderCache: Resolve -Wreorder warnings Lays out the initializer lists to be in the same order that initialization would occur in. --- .../GraphicsModSystem/Runtime/CustomShaderCache.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp index 27112846c6..cd871b5833 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp @@ -95,8 +95,8 @@ void CustomShaderCache::AsyncCreatePipeline(const VideoCommon::GXPipelineUid& ui PipelineWorkItem(CustomShaderCache* shader_cache, const VideoCommon::GXPipelineUid& uid, const CustomShaderInstance& custom_shaders, PipelineIterator iterator, const AbstractPipelineConfig& pipeline_config) - : m_shader_cache(shader_cache), m_uid(uid), m_iterator(iterator), - m_custom_shaders(custom_shaders), m_config(pipeline_config) + : m_shader_cache(shader_cache), m_uid(uid), m_iterator(iterator), m_config(pipeline_config), + m_custom_shaders(custom_shaders) { SetStagesReady(); } @@ -179,8 +179,8 @@ void CustomShaderCache::AsyncCreatePipeline(const VideoCommon::GXUberPipelineUid PipelineWorkItem(CustomShaderCache* shader_cache, const VideoCommon::GXUberPipelineUid& uid, const CustomShaderInstance& custom_shaders, UberPipelineIterator iterator, const AbstractPipelineConfig& pipeline_config) - : m_shader_cache(shader_cache), m_uid(uid), m_iterator(iterator), - m_custom_shaders(custom_shaders), m_config(pipeline_config) + : m_shader_cache(shader_cache), m_uid(uid), m_iterator(iterator), m_config(pipeline_config), + m_custom_shaders(custom_shaders) { SetStagesReady(); }