From 24779fda97733bcd7e29d39167c4bed2d95be75d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 9 Jan 2016 02:09:24 +0100 Subject: [PATCH] Rename stock_program variables --- gfx/d3d/render_chain_cg.cpp | 6 +++--- gfx/drivers_shader/shader_gl_cg.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp index d26ea7e6ec..e54146ef44 100644 --- a/gfx/d3d/render_chain_cg.cpp +++ b/gfx/d3d/render_chain_cg.cpp @@ -106,7 +106,7 @@ static INLINE D3DTEXTUREFILTERTYPE translate_filter(unsigned type) return D3DTEXF_POINT; } -static const char *stock_program = +static const char *stock_cg_d3d9_program = "void main_vertex" "(" " float4 position : POSITION," @@ -221,10 +221,10 @@ static bool d3d9_cg_load_program(void *data, } 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); 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); CG_D3D_SET_LISTING(cg_data, v); } diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 89363acb72..addf622afa 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -56,7 +56,7 @@ /* Used when we call deactivate() since just unbinding * the program didn't seem to work... */ -static const char *stock_cg_program = +static const char *stock_cg_gl_program = "struct input" "{" " 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) { - 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"); return false;