From 1f3c5fc71cfbc43af4928dbe5e7d116af65131f2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 Apr 2015 18:46:28 +0200 Subject: [PATCH] (D3D) Turn some functions static --- gfx/d3d/render_chain.cpp | 49 ++++++++++++++++++++-------------------- gfx/d3d/render_chain.h | 2 -- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/gfx/d3d/render_chain.cpp b/gfx/d3d/render_chain.cpp index 142c7a960d..7005b0a457 100644 --- a/gfx/d3d/render_chain.cpp +++ b/gfx/d3d/render_chain.cpp @@ -1388,6 +1388,31 @@ void renderchain_blit_to_texture(void *data, const void *frame, &d3dlr, frame, width, height, pitch); } +static void renderchain_unbind_all(void *data) +{ + unsigned i; + renderchain_t *chain = (renderchain_t*)data; + LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; + + /* Have to be a bit anal about it. + * Render targets hate it when they have filters apparently. + */ + for (i = 0; i < chain->bound_tex.size(); i++) + { + d3d_set_sampler_minfilter(d3dr, + chain->bound_tex[i], D3DTEXF_POINT); + d3d_set_sampler_magfilter(d3dr, + chain->bound_tex[i], D3DTEXF_POINT); + d3d_set_texture(d3dr, chain->bound_tex[i], NULL); + } + + for (i = 0; i < chain->bound_vert.size(); i++) + d3d_set_stream_source(d3dr, chain->bound_vert[i], 0, 0, 0); + + chain->bound_tex.clear(); + chain->bound_vert.clear(); +} + void renderchain_render_pass(void *data, void *pass_data, unsigned pass_index) { unsigned i; @@ -1473,27 +1498,3 @@ void renderchain_log_info(void *data, const void *info_data) info->pass->filter == RARCH_FILTER_LINEAR ? "true" : "false"); } -void renderchain_unbind_all(void *data) -{ - unsigned i; - renderchain_t *chain = (renderchain_t*)data; - LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; - - /* Have to be a bit anal about it. - * Render targets hate it when they have filters apparently. - */ - for (i = 0; i < chain->bound_tex.size(); i++) - { - d3d_set_sampler_minfilter(d3dr, - chain->bound_tex[i], D3DTEXF_POINT); - d3d_set_sampler_magfilter(d3dr, - chain->bound_tex[i], D3DTEXF_POINT); - d3d_set_texture(d3dr, chain->bound_tex[i], NULL); - } - - for (i = 0; i < chain->bound_vert.size(); i++) - d3d_set_stream_source(d3dr, chain->bound_vert[i], 0, 0, 0); - - chain->bound_tex.clear(); - chain->bound_vert.clear(); -} diff --git a/gfx/d3d/render_chain.h b/gfx/d3d/render_chain.h index e1dfd727a8..52b83233cf 100644 --- a/gfx/d3d/render_chain.h +++ b/gfx/d3d/render_chain.h @@ -104,8 +104,6 @@ void renderchain_render_pass(void *data, void *pass_data, unsigned pass_index); void renderchain_log_info(void *data, const void *info_data); -void renderchain_unbind_all(void *data); - bool renderchain_compile_shaders(void *data, void *fragment_data, void *vertex_data, const std::string &shader);