From 8cd7cb203ebf287d3b111a1223a95930fba1eade Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 6 Jan 2016 23:54:53 +0100 Subject: [PATCH] Revert "(D3D) Remove some more _XBOX ifdefs" This reverts commit de989f202a32b0cd8734371646b02a5d67ef7cb7. --- gfx/d3d/d3d.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index ca3ed7bc9a..e1eb39f954 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -600,6 +600,7 @@ static bool d3d_construct(d3d_video_t *d3d, video_driver_set_size(&new_width, &new_height); } +#ifndef _XBOX #ifdef HAVE_WINDOW DWORD style; unsigned win_width, win_height; @@ -670,6 +671,7 @@ static bool d3d_construct(d3d_video_t *d3d, win32_show_cursor(!info->fullscreen); + #ifdef HAVE_SHADERS /* This should only be done once here * to avoid set_shader() to be overridden @@ -681,6 +683,7 @@ static bool d3d_construct(d3d_video_t *d3d, if (!d3d_process_shader(d3d)) return false; +#endif #endif d3d->video_info = *info; @@ -824,7 +827,9 @@ static void d3d_free(void *data) d3d_free_overlays(d3d); #endif +#ifdef _XBOX gfx_ctx_free(); +#else #ifdef HAVE_MENU d3d_free_overlay(d3d, d3d->menu); @@ -980,6 +985,8 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info) return true; } +#ifdef _XBOX + #ifdef _XBOX1 #include @@ -1040,6 +1047,8 @@ static bool texture_image_render(d3d_video_t *d3d, } #endif +#endif + #ifdef HAVE_FBO static bool d3d_init_multipass(d3d_video_t *d3d) {