From 388206ed6bfeb504ff3563bee8c0057a5c70b2ea Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 Apr 2015 18:59:13 +0200 Subject: [PATCH] (XBOX) Move XBOX1 SetFlickerFilter to renderchain_blit_texture --- gfx/d3d/render_chain.cpp | 5 ----- gfx/d3d/render_chain_xdk.h | 17 +++++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/gfx/d3d/render_chain.cpp b/gfx/d3d/render_chain.cpp index d559b271a0..a788fa7b39 100644 --- a/gfx/d3d/render_chain.cpp +++ b/gfx/d3d/render_chain.cpp @@ -1203,7 +1203,6 @@ bool renderchain_render(void *chain_data, const void *data, unsigned i, current_width, current_height, out_width = 0, out_height = 0; renderchain_t *chain = (renderchain_t*)chain_data; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; - global_t *global = global_get_ptr(); renderchain_start_render(chain); @@ -1213,10 +1212,6 @@ bool renderchain_render(void *chain_data, const void *data, &out_width, &out_height, current_width, current_height, chain->final_viewport); -#ifdef _XBOX1 - d3dr->SetFlickerFilter(global->console.screen.flicker_filter_index); - d3dr->SetSoftDisplayFilter(global->console.softfilter_enable); -#endif renderchain_blit_to_texture(chain, data, width, height, pitch); /* Grab back buffer. */ diff --git a/gfx/d3d/render_chain_xdk.h b/gfx/d3d/render_chain_xdk.h index 9b635d9f2e..1a5a5a2de5 100644 --- a/gfx/d3d/render_chain_xdk.h +++ b/gfx/d3d/render_chain_xdk.h @@ -243,8 +243,15 @@ static void renderchain_blit_to_texture(void *data, const void *frame, unsigned width, unsigned height, unsigned pitch) { D3DLOCKED_RECT d3dlr; - d3d_video_t *d3d = (d3d_video_t*)data; - driver_t *driver = driver_get_ptr(); + d3d_video_t *d3d = (d3d_video_t*)data; + LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; + driver_t *driver = driver_get_ptr(); + global_t *global = global_get_ptr(); + +#if defined(_XBOX1) + d3dr->SetFlickerFilter(global->console.screen.flicker_filter_index); + d3dr->SetSoftDisplayFilter(global->console.softfilter_enable); +#endif if (d3d->last_width != width || d3d->last_height != height) { @@ -264,12 +271,6 @@ static void renderchain_render_pass(void *data, const void *frame, LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; runloop_t *runloop = rarch_main_get_ptr(); settings_t *settings = config_get_ptr(); - global_t *global = global_get_ptr(); - -#if defined(_XBOX1) - d3dr->SetFlickerFilter(global->console.screen.flicker_filter_index); - d3dr->SetSoftDisplayFilter(global->console.softfilter_enable); -#endif renderchain_blit_to_texture(d3d, frame, width, height, pitch); renderchain_set_vertices(d3d, 1, width, height);