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

Remove some more Xbox ifdefs

Browse Source
This commit is contained in:
twinaphex 2018-01-08 23:06:09 +01:00
parent 9f804f40bc
commit 8f9d807306
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/common/win32_common.c
View File

@ -1179,7 +1179,11 @@ bool win32_has_focus(void)
HWND win32_get_window(void) HWND win32_get_window(void)
{ {
#ifdef _XBOX
return NULL;
#else
return main_window.hwnd; return main_window.hwnd;
#endif
} }
void win32_window_reset(void) void win32_window_reset(void)

10
gfx/drivers/d3d.c
View File

@ -586,9 +586,7 @@ void d3d_make_d3dpp(void *data,
d3dpp->BackBufferCount = 2; d3dpp->BackBufferCount = 2;
d3dpp->BackBufferFormat = d3d_get_color_format_backbuffer( d3dpp->BackBufferFormat = d3d_get_color_format_backbuffer(
info->rgb32, windowed_enable); info->rgb32, windowed_enable);
#ifndef _XBOX
d3dpp->hDeviceWindow = win32_get_window(); d3dpp->hDeviceWindow = win32_get_window();
#endif
#ifdef _XBOX360 #ifdef _XBOX360
d3dpp->FrontBufferFormat = d3d_get_color_format_front_buffer(); d3dpp->FrontBufferFormat = d3d_get_color_format_front_buffer();
@ -672,11 +670,7 @@ void d3d_make_d3dpp(void *data,
static bool d3d_init_base(void *data, const video_info_t *info) static bool d3d_init_base(void *data, const video_info_t *info)
{ {
D3DPRESENT_PARAMETERS d3dpp; D3DPRESENT_PARAMETERS d3dpp;
#ifdef _XBOX
HWND focus_window = NULL;
#else
HWND focus_window = win32_get_window(); HWND focus_window = win32_get_window();
#endif
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
memset(&d3dpp, 0, sizeof(d3dpp)); memset(&d3dpp, 0, sizeof(d3dpp));
@ -1453,9 +1447,7 @@ static bool d3d_frame(void *data, const void *frame,
D3DVIEWPORT screen_vp; D3DVIEWPORT screen_vp;
unsigned i = 0; unsigned i = 0;
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
#ifndef _XBOX
HWND window = win32_get_window(); HWND window = win32_get_window();
#endif
unsigned width = video_info->width; unsigned width = video_info->width;
unsigned height = video_info->height; unsigned height = video_info->height;
@ -1467,10 +1459,8 @@ static bool d3d_frame(void *data, const void *frame,
/* We cannot recover in fullscreen. */ /* We cannot recover in fullscreen. */
if (d3d->needs_restore) if (d3d->needs_restore)
{ {
#ifndef _XBOX
if (IsIconic(window)) if (IsIconic(window))
return true; return true;
#endif
if (!d3d_restore(d3d)) if (!d3d_restore(d3d))
{ {