mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(D3D) Remove some more _XBOX ifdefs"

Browse Source 
This reverts commit de989f202a32b0cd8734371646b02a5d67ef7cb7.
This commit is contained in:
twinaphex 2016-01-06 23:54:53 +01:00
parent de989f202a
commit 8cd7cb203e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/d3d/d3d.cpp
View File

@ -600,6 +600,7 @@ static bool d3d_construct(d3d_video_t *d3d,
video_driver_set_size(&new_width, &new_height); video_driver_set_size(&new_width, &new_height);
} }
#ifndef _XBOX
#ifdef HAVE_WINDOW #ifdef HAVE_WINDOW
DWORD style; DWORD style;
unsigned win_width, win_height; unsigned win_width, win_height;
@ -670,6 +671,7 @@ static bool d3d_construct(d3d_video_t *d3d,
win32_show_cursor(!info->fullscreen); win32_show_cursor(!info->fullscreen);
#ifdef HAVE_SHADERS #ifdef HAVE_SHADERS
/* This should only be done once here /* This should only be done once here
* to avoid set_shader() to be overridden * to avoid set_shader() to be overridden
@ -681,6 +683,7 @@ static bool d3d_construct(d3d_video_t *d3d,
if (!d3d_process_shader(d3d)) if (!d3d_process_shader(d3d))
return false; return false;
#endif
#endif #endif
d3d->video_info = *info; d3d->video_info = *info;
@ -824,7 +827,9 @@ static void d3d_free(void *data)
d3d_free_overlays(d3d); d3d_free_overlays(d3d);
#endif #endif
#ifdef _XBOX
gfx_ctx_free(); gfx_ctx_free();
#else
#ifdef HAVE_MENU #ifdef HAVE_MENU
d3d_free_overlay(d3d, d3d->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; return true;
} }
#ifdef _XBOX
#ifdef _XBOX1 #ifdef _XBOX1
#include <formats/image.h> #include <formats/image.h>
@ -1040,6 +1047,8 @@ static bool texture_image_render(d3d_video_t *d3d,
} }
#endif #endif
#endif
#ifdef HAVE_FBO #ifdef HAVE_FBO
static bool d3d_init_multipass(d3d_video_t *d3d) static bool d3d_init_multipass(d3d_video_t *d3d)
{ {