mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 06:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GLSL) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-04-13 06:04:29 +02:00
parent edcf3fd1ee
commit 53dad5bc73
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gfx/drivers_shader/shader_glsl.c
View File

@ -1177,6 +1177,9 @@ static void gl_glsl_set_params(void *data, void *shader_data,
if (glsl->glsl_active_index) if (glsl->glsl_active_index)
{ {
unsigned j;
struct uniform_info orig_uniforms[2];
/* Set original texture. */ /* Set original texture. */
if (uni->orig.texture >= 0) if (uni->orig.texture >= 0)
{ {
@ -1195,11 +1198,26 @@ static void gl_glsl_set_params(void *data, void *shader_data,
texunit++; texunit++;
} }
orig_uniforms[0].enabled = false;
orig_uniforms[0].location = uni->orig.texture_size;
orig_uniforms[0].type = UNIFORM_2FV;
orig_uniforms[0].result.integer.v0 = texunit;
orig_uniforms[0].result.floatv = (float*)info->tex_size;
if (uni->orig.texture_size >= 0) if (uni->orig.texture_size >= 0)
glUniform2fv(uni->orig.texture_size, 1, info->tex_size); orig_uniforms[0].enabled = true;
orig_uniforms[1].enabled = false;
orig_uniforms[1].location = uni->orig.input_size;
orig_uniforms[1].type = UNIFORM_2FV;
orig_uniforms[1].result.integer.v0 = texunit;
orig_uniforms[1].result.floatv = (float*)info->input_size;
if (uni->orig.input_size >= 0) if (uni->orig.input_size >= 0)
glUniform2fv(uni->orig.input_size, 1, info->input_size); orig_uniforms[1].enabled = true;
for (j = 0; j < 2; j++)
glsl_uniform_set_parameter(&orig_uniforms[i], NULL);
/* Pass texture coordinates. */ /* Pass texture coordinates. */
if (uni->orig.tex_coord >= 0) if (uni->orig.tex_coord >= 0)