From 4320efa9a1ed4566d4f01614adc4943aba229fb8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 8 Jun 2014 04:29:25 +0200 Subject: [PATCH] (D3D) Move ifndef XBOX functionality to D3D context driver --- gfx/context/d3d_ctx.cpp | 5 +++-- gfx/d3d9/d3d.cpp | 3 --- xdk/xdk_d3d.cpp | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gfx/context/d3d_ctx.cpp b/gfx/context/d3d_ctx.cpp index da14539e62..3ed67d7f55 100644 --- a/gfx/context/d3d_ctx.cpp +++ b/gfx/context/d3d_ctx.cpp @@ -432,15 +432,16 @@ static void gfx_ctx_d3d_get_video_size(void *data, unsigned *width, unsigned *he static void gfx_ctx_d3d_swap_interval(void *data, unsigned interval) { - (void)data; -#ifdef _XBOX d3d_video_t *d3d = (d3d_video_t*)data; +#ifdef _XBOX LPDIRECT3DDEVICE d3dr = d3d->dev; if (interval) d3dr->SetRenderState(XBOX_PRESENTATIONINTERVAL, D3DPRESENT_INTERVAL_ONE); else d3dr->SetRenderState(XBOX_PRESENTATIONINTERVAL, D3DPRESENT_INTERVAL_IMMEDIATE); +#else + d3d_restore(d3d); #endif } diff --git a/gfx/d3d9/d3d.cpp b/gfx/d3d9/d3d.cpp index 08ab3d43e9..fa94b5922f 100644 --- a/gfx/d3d9/d3d.cpp +++ b/gfx/d3d9/d3d.cpp @@ -794,9 +794,6 @@ static void d3d_set_nonblock_state(void *data, bool state) if (d3d->ctx_driver && d3d->ctx_driver->swap_interval) d3d->ctx_driver->swap_interval(d3d, state ? 0 : 1); -#ifndef _XBOX - d3d_restore(d3d); -#endif } static bool d3d_alive(void *data) diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index 3a27e1c438..212ac58a15 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -948,9 +948,6 @@ static void d3d_set_nonblock_state(void *data, bool state) if (d3d->ctx_driver && d3d->ctx_driver->swap_interval) d3d->ctx_driver->swap_interval(d3d, state ? 0 : 1); -#ifndef _XBOX - d3d_restore(d3d); -#endif } static bool d3d_alive(void *data)