From ca39d5f7075335e0ba08ec00c52d8e48299455d6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 6 Apr 2015 00:08:15 +0200 Subject: [PATCH] (D3D) Move renderchain_unbind_all up --- gfx/d3d/render_chain.cpp | 52 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/gfx/d3d/render_chain.cpp b/gfx/d3d/render_chain.cpp index 0483b3df85..96b45f3d0c 100644 --- a/gfx/d3d/render_chain.cpp +++ b/gfx/d3d/render_chain.cpp @@ -1278,6 +1278,31 @@ static void renderchain_blit_to_texture(void *data, &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(); +} + static void renderchain_render_pass(void *data, void *pass_data, unsigned pass_index) { unsigned i; @@ -1453,30 +1478,3 @@ void renderchain_convert_geometry( break; } } - - -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(); -} -