From 56b64689b7c5911a3c5ef980d42032c1866ae290 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 9 Jan 2016 01:12:50 +0100 Subject: [PATCH] N/A --- gfx/d3d/render_chain_cg.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp index 0888fa74e0..747ad4b20e 100644 --- a/gfx/d3d/render_chain_cg.cpp +++ b/gfx/d3d/render_chain_cg.cpp @@ -246,18 +246,6 @@ static INLINE void renderchain_set_shaders(void *data, CGprogram *fPrg, CGprogra cgD3D9BindProgram(*vPrg); } -static void renderchain_destroy_shader(cg_renderchain_t *chain, int i) -{ - if (!chain) - return; - - if (chain->passes[i].fPrg) - cgDestroyProgram(chain->passes[i].fPrg); - if (chain->passes[i].vPrg) - cgDestroyProgram(chain->passes[i].vPrg); -} - - static void renderchain_set_shader_mvp(cg_renderchain_t *chain, void *shader_data, void *matrix_data) { CGprogram *vPrg = (CGprogram*)shader_data; @@ -670,7 +658,11 @@ static void d3d9_cg_deinit_progs(void *data) d3d_texture_free(cg_data->passes[i].tex); cg_data->passes[i].tex = NULL; d3d_vertex_buffer_free(cg_data->passes[i].vertex_buf, cg_data->passes[i].vertex_decl); - renderchain_destroy_shader(cg_data, i); + + if (chain->passes[i].fPrg) + cgDestroyProgram(chain->passes[i].fPrg); + if (chain->passes[i].vPrg) + cgDestroyProgram(chain->passes[i].vPrg); } }