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

(Cg) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-04-25 12:33:38 +02:00
parent d4184df592
commit 43943fe794
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gfx/drivers_shader/shader_gl_cg.c
View File

@ -120,14 +120,12 @@ struct uniform_cg_data
CGparameter loc;
};
#define cg_gl_set_coord(param, cg_data, ptr, len) do { \
if (param) \
{ \
cgGLSetParameterPointer(param, len, GL_FLOAT, 0, ptr); \
cgGLEnableClientState(param); \
cg_data->attribs.elems[cg_data->attribs.index++] = param; \
} \
} while(0)
#define gl_cg_set_coord_array(param, cg_data, ptr, len) \
{ \
cgGLSetParameterPointer(param, len, GL_FLOAT, 0, ptr); \
cgGLEnableClientState(param); \
cg_data->attribs.elems[cg_data->attribs.index++] = param; \
}
#define cg_gl_set_texture_parameter(param, texture) \
if (param) \
@ -269,10 +267,17 @@ static bool gl_cg_set_coords(void *handle_data, void *shader_data, const struct
if (!cg_data || !coords)
goto fallback;
cg_gl_set_coord(cg_data->prg[cg_data->active_idx].vertex, cg_data, coords->vertex, 2);
cg_gl_set_coord(cg_data->prg[cg_data->active_idx].tex, cg_data, coords->tex_coord, 2);
cg_gl_set_coord(cg_data->prg[cg_data->active_idx].lut_tex, cg_data, coords->lut_tex_coord, 2);
cg_gl_set_coord(cg_data->prg[cg_data->active_idx].color, cg_data, coords->color, 4);
if (cg_data->prg[cg_data->active_idx].vertex)
gl_cg_set_coord_array(cg_data->prg[cg_data->active_idx].vertex, cg_data, coords->vertex, 2);
if (cg_data->prg[cg_data->active_idx].tex)
gl_cg_set_coord_array(cg_data->prg[cg_data->active_idx].tex, cg_data, coords->tex_coord, 2);
if (cg_data->prg[cg_data->active_idx].lut_tex)
gl_cg_set_coord_array(cg_data->prg[cg_data->active_idx].lut_tex, cg_data, coords->lut_tex_coord, 2);
if (cg_data->prg[cg_data->active_idx].color)
gl_cg_set_coord_array(cg_data->prg[cg_data->active_idx].color, cg_data, coords->color, 4);
return true;
@ -281,7 +286,6 @@ fallback:
return false;
}
static void gl_cg_set_texture_info(
cg_shader_data_t *cg_data,
const struct cg_fbo_params *params,
@ -325,7 +329,8 @@ static void gl_cg_set_texture_info(
for (i = 0; i < 4; i++)
gl_cg_set_uniform_parameter(cg_data, &uniform_params[i], &uniform_data[i]);
cg_gl_set_coord(params->coord, cg_data, info->coord, 2);
if (params->coord)
gl_cg_set_coord_array(params->coord, cg_data, info->coord, 2);
}
static void gl_cg_set_params(void *data, void *shader_data,