mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop glsl_modern global.

Browse Source
This commit is contained in:
Themaister 2013-04-07 12:51:26 +02:00
parent 50c184042e
commit 0d1c3097e3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/shader_glsl.c
View File

@ -123,7 +123,6 @@ static PFNGLVERTEXATTRIBPOINTERPROC pglVertexAttribPointer;
static struct gfx_shader *glsl_shader; static struct gfx_shader *glsl_shader;
static bool glsl_enable; static bool glsl_enable;
static bool glsl_modern;
static GLuint gl_program[GFX_MAX_SHADERS]; static GLuint gl_program[GFX_MAX_SHADERS];
static unsigned active_index; static unsigned active_index;
@ -594,10 +593,13 @@ bool gl_glsl_init(const char *path)
if (!glsl_shader) if (!glsl_shader)
return false; return false;
if (path && !gfx_shader_read_xml(path, glsl_shader)) if (path)
{ {
RARCH_ERR("[GL]: Failed to parse XML shader.\n"); if (!gfx_shader_read_xml(path, glsl_shader))
return false; {
RARCH_ERR("[GL]: Failed to parse XML shader.\n");
return false;
}
} }
else else
{ {
@ -887,7 +889,7 @@ void gl_glsl_set_params(unsigned width, unsigned height,
bool gl_glsl_set_mvp(const math_matrix *mat) bool gl_glsl_set_mvp(const math_matrix *mat)
{ {
if (!glsl_enable || !glsl_modern) if (!glsl_enable || !glsl_shader->modern)
return false; return false;
int loc = gl_uniforms[active_index].mvp; int loc = gl_uniforms[active_index].mvp;
@ -899,7 +901,7 @@ bool gl_glsl_set_mvp(const math_matrix *mat)
bool gl_glsl_set_coords(const struct gl_coords *coords) bool gl_glsl_set_coords(const struct gl_coords *coords)
{ {
if (!glsl_enable || !glsl_modern) if (!glsl_enable || !glsl_shader->modern)
return false; return false;
const struct shader_uniforms *uni = &gl_uniforms[active_index]; const struct shader_uniforms *uni = &gl_uniforms[active_index];