From 6365ac2174dbb2e86c8e94e235235ac24ff0f9d3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 Apr 2015 18:49:29 +0200 Subject: [PATCH] (D3D) Turn more functions static --- gfx/d3d/render_chain.cpp | 15 +++++++-------- gfx/d3d/render_chain.h | 14 -------------- gfx/d3d/render_chain_xdk.h | 1 - 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/gfx/d3d/render_chain.cpp b/gfx/d3d/render_chain.cpp index 7005b0a457..51f3a05815 100644 --- a/gfx/d3d/render_chain.cpp +++ b/gfx/d3d/render_chain.cpp @@ -252,7 +252,7 @@ void renderchain_set_shaders(void *data, void *fragment_data, void *vertex_data) cgD3D9BindProgram(*vPrg); } -void renderchain_destroy_stock_shader(void *data) +static void renderchain_destroy_stock_shader(void *data) { renderchain_t *chain = (renderchain_t*)data; @@ -282,7 +282,7 @@ void renderchain_destroy_shader(void *data, int i) #endif } -void renderchain_set_shader_mvp(void *data, void *shader_data, void *matrix_data) +static void renderchain_set_shader_mvp(void *data, void *shader_data, void *matrix_data) { CGprogram *vPrg = (CGprogram*)shader_data; const D3DXMATRIX *matrix = (const D3DXMATRIX*)matrix_data; @@ -329,8 +329,7 @@ void renderchain_set_shader_params(void *data, void *pass_data, set_cg_param(pass->vPrg, "IN.frame_count", frame_cnt); } - -void renderchain_bind_tracker(void *data, void *pass_data, unsigned pass_index) +static void renderchain_bind_tracker(void *data, void *pass_data, unsigned pass_index) { unsigned i; Pass *pass = (Pass*)pass_data; @@ -496,7 +495,7 @@ bool renderchain_init_shader_fvf(void *data, void *pass_data) return true; } -void renderchain_bind_orig(void *data, void *pass_data) +static void renderchain_bind_orig(void *data, void *pass_data) { unsigned index; CGparameter param; @@ -537,7 +536,7 @@ void renderchain_bind_orig(void *data, void *pass_data) } } -void renderchain_bind_prev(void *data, void *pass_data) +static void renderchain_bind_prev(void *data, void *pass_data) { unsigned i, index; char attr_texture[64], attr_input_size[64], attr_tex_size[64], attr_coord[64]; @@ -627,7 +626,7 @@ static void renderchain_add_lut(renderchain_t *chain, chain->bound_tex.push_back(index); } -void renderchain_bind_luts(void *data, void *pass_data) +static void renderchain_bind_luts(void *data, void *pass_data) { unsigned i, index; Pass *pass = (Pass*)pass_data; @@ -658,7 +657,7 @@ void renderchain_bind_luts(void *data, void *pass_data) } } -void renderchain_bind_pass(void *data, void *pass_data, unsigned pass_index) +static void renderchain_bind_pass(void *data, void *pass_data, unsigned pass_index) { unsigned i, index; Pass *pass = (Pass*)pass_data; diff --git a/gfx/d3d/render_chain.h b/gfx/d3d/render_chain.h index 52b83233cf..a9bfd1169b 100644 --- a/gfx/d3d/render_chain.h +++ b/gfx/d3d/render_chain.h @@ -109,28 +109,14 @@ bool renderchain_compile_shaders(void *data, void *fragment_data, void renderchain_set_shaders(void *data, void *fragment_data, void *vertex_data); -void renderchain_destroy_stock_shader(void *data); - void renderchain_destroy_shader(void *data, int i); -void renderchain_set_shader_mvp(void *data, void *shader_data, void *matrix_data); - void renderchain_set_shader_params(void *data, void *pass_data, unsigned video_w, unsigned video_h, unsigned tex_w, unsigned tex_h, unsigned viewport_w, unsigned viewport_h); -void renderchain_bind_tracker(void *data, void *pass_data, unsigned pass_index); - bool renderchain_init_shader_fvf(void *data, void *pass_data); -void renderchain_bind_orig(void *data, void *pass_data); - -void renderchain_bind_prev(void *data, void *pass_data); - -void renderchain_bind_luts(void *data, void *pass_data); - -void renderchain_bind_pass(void *data, void *pass_data, unsigned pass_index); - #endif diff --git a/gfx/d3d/render_chain_xdk.h b/gfx/d3d/render_chain_xdk.h index 930d8ce3e1..9b635d9f2e 100644 --- a/gfx/d3d/render_chain_xdk.h +++ b/gfx/d3d/render_chain_xdk.h @@ -36,7 +36,6 @@ static void renderchain_free(void *data) return; renderchain_clear(chain); - //renderchain_destroy_stock_shader(chain); #ifndef DONT_HAVE_STATE_TRACKER #ifndef _XBOX if (chain->tracker)