From 3b3065f736cb2bf4b9a4a29111010dc2a9a350cb Mon Sep 17 00:00:00 2001 From: pstef <3462925+pstef@users.noreply.github.com> Date: Wed, 9 Apr 2025 16:59:49 +0000 Subject: [PATCH] Fix variable name collision const char *id overshadowed the function parameter int id. --- gfx/drivers/gx2_gfx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c index 1df7a4f36e..14fed4f7cf 100644 --- a/gfx/drivers/gx2_gfx.c +++ b/gfx/drivers/gx2_gfx.c @@ -1661,7 +1661,7 @@ static bool wiiu_init_frame_textures(wiiu_video_t *wiiu, unsigned width, unsigne } static void gx2_update_uniform_block(wiiu_video_t *wiiu, - int pass, float *ubo, int id, + int pass, float *ubo, int chosen_id, int size, int uniformVarCount, GX2UniformVar *uniformVars, uint64_t frame_count, int32_t frame_direction, uint32_t rotation, float core_aspect, float core_aspect_rot, uint32_t frame_time_delta, uint32_t original_fps) @@ -1672,7 +1672,7 @@ static void gx2_update_uniform_block(wiiu_video_t *wiiu, int k; float *dst; const char *id = NULL; - if (uniformVars[i].block != id) + if (uniformVars[i].block != chosen_id) continue; if (!(id = strrchr(uniformVars[i].name, '.'))) continue;