mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 19:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-04-16 19:50:23 +02:00
parent d562bf38cb
commit 4e63113f72
5 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/drivers_shader/shader_gl_cg.c
View File

@ -113,14 +113,11 @@ struct uniform_cg_data
static void gl_cg_set_uniform_parameter(
void *data,
struct uniform_info *param,
void *_shader_info_data,
void *uniform_data)
{
CGparameter location;
cg_shader_data_t *cg_data = (cg_shader_data_t*)data;
(void)_shader_info_data;
if (!param || !param->enabled)
return;
@ -326,7 +323,7 @@ static void gl_cg_set_texture_info(
uniform_data[3].loc = params->tex_size_f;
for (i = 0; i < 4; i++)
gl_cg_set_uniform_parameter(cg_data, &uniform_params[i], NULL, &uniform_data[i]);
gl_cg_set_uniform_parameter(cg_data, &uniform_params[i], &uniform_data[i]);
if (params->coord)
{
@ -442,7 +439,7 @@ static void gl_cg_set_params(void *data, void *shader_data,
}
for (i = 0; i < uniform_count; i++)
gl_cg_set_uniform_parameter(cg_data, &uniform_params[i], &cg_data->prg[i], &uniform_data[i]);
gl_cg_set_uniform_parameter(cg_data, &uniform_params[i], &uniform_data[i]);
/* Set orig texture. */
gl_cg_set_texture_info(cg_data, &cg_data->prg[cg_data->active_idx].orig, info);
@ -506,7 +503,7 @@ static void gl_cg_set_params(void *data, void *shader_data,
uniform_params[1].result.f.v0 = cg_data->shader->parameters[i].current;
for (j = 0; j < 2; j++)
gl_cg_set_uniform_parameter(cg_data, &uniform_params[j], &cg_data->prg[j], &pragma_cg_params[j]);
gl_cg_set_uniform_parameter(cg_data, &uniform_params[j], &pragma_cg_params[j]);
}
/* Set state parameters. */
@ -541,7 +538,7 @@ static void gl_cg_set_params(void *data, void *shader_data,
uniform_params[1].result.f.v0 = tracker_info[i].value;
for (j = 0; j < 2; j++)
gl_cg_set_uniform_parameter(cg_data, &uniform_params[j], &cg_data->prg[j], &pragma_cg_params[j]);
gl_cg_set_uniform_parameter(cg_data, &uniform_params[j], &pragma_cg_params[j]);
}
}
}

23
gfx/drivers_shader/shader_glsl.c
View File

@ -1052,14 +1052,11 @@ error:
static void gl_glsl_set_uniform_parameter(
void *data,
struct uniform_info *param,
void *shader_info_data,
void *uniform_data)
{
GLint location = 0;
glsl_shader_data_t *glsl = (glsl_shader_data_t*)data;
(void)shader_info_data;
if (!param)
return;
@ -1194,7 +1191,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
uniform_count++;
for (i = 0; i < uniform_count; i++)
gl_glsl_set_uniform_parameter(glsl, &uniform_params[i], NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &uniform_params[i], NULL);
/* Set lookup textures. */
for (i = 0; i < glsl->shader->luts; i++)
@ -1212,7 +1209,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
lut_uniform.type = UNIFORM_1I;
lut_uniform.result.integer.v0 = texunit;
gl_glsl_set_uniform_parameter(glsl, &lut_uniform, NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &lut_uniform, NULL);
texunit++;
}
@ -1234,7 +1231,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
orig_tex_uniform.type = UNIFORM_1I;
orig_tex_uniform.result.integer.v0 = texunit;
gl_glsl_set_uniform_parameter(glsl, &orig_tex_uniform, NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &orig_tex_uniform, NULL);
glBindTexture(GL_TEXTURE_2D, info->tex);
texunit++;
@ -1257,7 +1254,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
orig_uniforms[1].enabled = true;
for (j = 0; j < 2; j++)
gl_glsl_set_uniform_parameter(glsl, &orig_uniforms[i], NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &orig_uniforms[i], NULL);
/* Pass texture coordinates. */
if (uni->orig.tex_coord >= 0)
@ -1285,7 +1282,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
feedback_texture_param.type = UNIFORM_1I;
feedback_texture_param.result.integer.v0 = texunit;
gl_glsl_set_uniform_parameter(glsl, &feedback_texture_param, NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &feedback_texture_param, NULL);
glBindTexture(GL_TEXTURE_2D, feedback_info->tex);
texunit++;
@ -1308,7 +1305,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
feedback_uniforms[1].enabled = true;
for (j = 0; j < 2; j++)
gl_glsl_set_uniform_parameter(glsl, &feedback_uniforms[i], NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &feedback_uniforms[i], NULL);
/* Pass texture coordinates. */
if (uni->feedback.tex_coord >= 0)
@ -1359,7 +1356,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
fbo_tex_params[2].enabled = true;
for (j = 0; j < 3; j++)
gl_glsl_set_uniform_parameter(glsl, &fbo_tex_params[i], NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &fbo_tex_params[i], NULL);
if (uni->pass[i].tex_coord >= 0)
{
@ -1411,7 +1408,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
prev_tex_params[2].enabled = true;
for (j = 0; j < 3; j++)
gl_glsl_set_uniform_parameter(glsl, &prev_tex_params[i], NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &prev_tex_params[i], NULL);
/* Pass texture coordinates. */
if (uni->prev[i].tex_coord >= 0)
@ -1448,7 +1445,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
pragma_param.type = UNIFORM_1F;
pragma_param.result.f.v0 = glsl->shader->parameters[i].current;
gl_glsl_set_uniform_parameter(glsl, &pragma_param, NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &pragma_param, NULL);
}
/* Set state parameters. */
@ -1473,7 +1470,7 @@ static void gl_glsl_set_params(void *data, void *shader_data,
state_param.type = UNIFORM_1F;
state_param.result.f.v0 = state_info[i].value;
gl_glsl_set_uniform_parameter(glsl, &state_param, NULL, NULL);
gl_glsl_set_uniform_parameter(glsl, &state_param, NULL);
}
}
}

2
gfx/drivers_shader/shader_hlsl.c
View File

@ -106,13 +106,11 @@ void hlsl_set_proj_matrix(void *data, XMMATRIX rotation_value)
static void hlsl_set_uniform_parameter(
void *data,
struct uniform_info *param,
void *_shader_info_data,
void *uniform_data)
{
hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)data;
(void)hlsl;
(void)_shader_info_data;
if (!param || !param->enabled)
return;

1
gfx/drivers_shader/shader_null.c
View File

@ -77,7 +77,6 @@ static void shader_null_set_params(void *data, void *shader_data,
static void shader_null_set_uniform_parameter(
void *data,
struct uniform_info *param,
void *shader_info_data,
void *uniform_data)
{
}

2
gfx/video_shader_driver.h
View File

@ -164,7 +164,7 @@ typedef struct shader_backend
const void *feedback_info,
const void *fbo_info, unsigned fbo_info_cnt);
void (*set_uniform_parameter)(void *data, struct uniform_info *param,
void *shader_info_data, void *uniform_data);
void *uniform_data);
bool (*compile_program)(void *data, unsigned idx,
void *program_data, struct shader_program_info *program_info);