ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17790 from pstef/gx2-update-uniform-block 

Fix variable name collision
This commit is contained in:
LibretroAdmin 2025-04-09 10:55:34 -07:00 committed by GitHub
parent a10dbbc1d0 3b3065f736
commit 036df1e9b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers/gx2_gfx.c
View File

@ -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;