From 537c1f4e173a863d87b6a0e5cd71e167db26f187 Mon Sep 17 00:00:00 2001 From: Jonas Date: Tue, 3 Nov 2026 07:10:48 +0600 Subject: video_core: fix the -Wshadow error in the FSR 3.1 upscaler Fsr3Upscaler::Pass::Dispatch took a scheduler parameter that shadows Fsr3Upscaler::scheduler, which fails the Windows MinGW PGO build under -Werror=shadow. --- src/video_core/renderer_vulkan/vk_fsr3_upscaler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_fsr3_upscaler.cpp b/src/video_core/renderer_vulkan/vk_fsr3_upscaler.cpp index 99275800d1..b199005b33 100644 --- a/src/video_core/renderer_vulkan/vk_fsr3_upscaler.cpp +++ b/src/video_core/renderer_vulkan/vk_fsr3_upscaler.cpp @@ -151,9 +151,9 @@ public: const std::array& samplers) : Pass(device_, scheduler, descriptor_pool, MakeLayout(kinds, samplers), code) {} - void Dispatch(Scheduler& scheduler, ComputePassDescriptorQueue& queue, + void Dispatch(Scheduler& scheduler_, ComputePassDescriptorQueue& queue, std::span resources, u32 groups_x, u32 groups_y) { - queue.Acquire(scheduler, resources.size()); + queue.Acquire(scheduler_, resources.size()); for (const Resource& resource : resources) { if (resource.buffer) { queue.AddBuffer(resource.buffer, resource.offset, resource.size); @@ -162,7 +162,7 @@ public: } } const void* const descriptor_data{queue.UpdateData()}; - scheduler.Record([this, descriptor_data, groups_x, groups_y](vk::CommandBuffer cmdbuf) { + scheduler_.Record([this, descriptor_data, groups_x, groups_y](vk::CommandBuffer cmdbuf) { const VkDescriptorSet set = descriptor_allocator.Commit(); device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data); cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline); -- cgit v1.2.3