Rename stock_program variables

This commit is contained in:
twinaphex 2016-01-09 02:09:24 +01:00
parent 12aa94f70f
commit 24779fda97
2 changed files with 5 additions and 5 deletions

View File

@ -106,7 +106,7 @@ static INLINE D3DTEXTUREFILTERTYPE translate_filter(unsigned type)
return D3DTEXF_POINT; return D3DTEXF_POINT;
} }
static const char *stock_program = static const char *stock_cg_d3d9_program =
"void main_vertex" "void main_vertex"
"(" "("
" float4 position : POSITION," " float4 position : POSITION,"
@ -221,10 +221,10 @@ static bool d3d9_cg_load_program(void *data,
} }
else else
{ {
*fPrg = cgCreateProgram(cg_data->cgCtx, CG_SOURCE, stock_program, *fPrg = cgCreateProgram(cg_data->cgCtx, CG_SOURCE, stock_cg_d3d9_program,
fragment_profile, "main_fragment", fragment_opts); fragment_profile, "main_fragment", fragment_opts);
CG_D3D_SET_LISTING(cg_data, f); CG_D3D_SET_LISTING(cg_data, f);
*vPrg = cgCreateProgram(cg_data->cgCtx, CG_SOURCE, stock_program, *vPrg = cgCreateProgram(cg_data->cgCtx, CG_SOURCE, stock_cg_d3d9_program,
vertex_profile, "main_vertex", vertex_opts); vertex_profile, "main_vertex", vertex_opts);
CG_D3D_SET_LISTING(cg_data, v); CG_D3D_SET_LISTING(cg_data, v);
} }

View File

@ -56,7 +56,7 @@
/* Used when we call deactivate() since just unbinding /* Used when we call deactivate() since just unbinding
* the program didn't seem to work... */ * the program didn't seem to work... */
static const char *stock_cg_program = static const char *stock_cg_gl_program =
"struct input" "struct input"
"{" "{"
" float2 tex_coord;" " float2 tex_coord;"
@ -565,7 +565,7 @@ static void gl_cg_set_program_base_attrib(void *data, unsigned i)
static bool gl_cg_load_stock(void *data) static bool gl_cg_load_stock(void *data)
{ {
if (!gl_cg_load_program(data, 0, stock_cg_program, false)) if (!gl_cg_load_program(data, 0, stock_cg_gl_program, false))
{ {
RARCH_ERR("Failed to compile passthrough shader, is something wrong with your environment?\n"); RARCH_ERR("Failed to compile passthrough shader, is something wrong with your environment?\n");
return false; return false;