libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-20 17:54:11 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Add uniform lookup for menu shaders.

Browse Source 
This fixes the mix-up of parameter assignments for the XMB ribbon shader
which was caused by all 4 uniform locations set to 0.
This commit is contained in:
Torsten Paul 2016-04-26 00:08:24 +02:00
parent b2ed32d664
commit fdd6d26d85
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers_shader/shader_glsl.c
View File

@ -911,6 +911,8 @@ static void *gl_glsl_init(void *data, const char *path)
VIDEO_SHADER_MENU, VIDEO_SHADER_MENU,
&glsl->prg[VIDEO_SHADER_MENU], &glsl->prg[VIDEO_SHADER_MENU],
&shader_prog_info); &shader_prog_info);
gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_MENU].id,
&glsl->uniforms[VIDEO_SHADER_MENU]);
shader_prog_info.vertex = stock_vertex_xmb_simple; shader_prog_info.vertex = stock_vertex_xmb_simple;
shader_prog_info.fragment = stock_fragment_xmb_simple; shader_prog_info.fragment = stock_fragment_xmb_simple;
@ -920,6 +922,8 @@ static void *gl_glsl_init(void *data, const char *path)
VIDEO_SHADER_MENU_SEC, VIDEO_SHADER_MENU_SEC,
&glsl->prg[VIDEO_SHADER_MENU_SEC], &glsl->prg[VIDEO_SHADER_MENU_SEC],
&shader_prog_info); &shader_prog_info);
gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_MENU_SEC].id,
&glsl->uniforms[VIDEO_SHADER_MENU_SEC]);
gl_glsl_reset_attrib(glsl); gl_glsl_reset_attrib(glsl);

4
menu/drivers/xmb.c
View File

@ -2391,9 +2391,9 @@ static void xmb_init_ribbon(xmb_handle_t * xmb)
} }
coords.color = dummy; coords.color = dummy;
coords.vertex = dummy; coords.vertex = ribbon_verts;
coords.tex_coord = dummy; coords.tex_coord = dummy;
coords.lut_tex_coord = ribbon_verts; coords.lut_tex_coord = dummy;
coords.vertices = XMB_RIBBON_VERTICES; coords.vertices = XMB_RIBBON_VERTICES;
gfx_coord_array_append(ca, &coords, XMB_RIBBON_VERTICES); gfx_coord_array_append(ca, &coords, XMB_RIBBON_VERTICES);