mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-24 18:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some Xbox unresolved symbols

Browse Source
This commit is contained in:
twinaphex 2017-09-14 22:24:04 +02:00
parent 3ab07fc43f
commit d149d590cf
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gfx/drivers/d3d.cpp
View File

@ -632,6 +632,15 @@ static bool d3d_init_base(void *data, const video_info_t *info)
d3d->cur_mon_id = 0; d3d->cur_mon_id = 0;
#endif #endif
#ifdef _XBOX
if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice(
d3d->cur_mon_id,
D3DDEVTYPE_HAL,
NULL,
D3DCREATE_HARDWARE_VERTEXPROCESSING,
&d3dpp,
&d3d->dev)))
#else
if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice( if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice(
d3d->cur_mon_id, d3d->cur_mon_id,
D3DDEVTYPE_HAL, D3DDEVTYPE_HAL,
@ -639,10 +648,20 @@ static bool d3d_init_base(void *data, const video_info_t *info)
D3DCREATE_HARDWARE_VERTEXPROCESSING, D3DCREATE_HARDWARE_VERTEXPROCESSING,
&d3dpp, &d3dpp,
&d3d->dev))) &d3d->dev)))
#endif
{ {
RARCH_WARN("[D3D]: Failed to init device with hardware vertex processing (code: 0x%x). Trying to fall back to software vertex processing.\n", RARCH_WARN("[D3D]: Failed to init device with hardware vertex processing (code: 0x%x). Trying to fall back to software vertex processing.\n",
(unsigned)d3d->d3d_err); (unsigned)d3d->d3d_err);
#ifdef _XBOX
if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice(
d3d->cur_mon_id,
D3DDEVTYPE_HAL,
NULL,
D3DCREATE_SOFTWARE_VERTEXPROCESSING,
&d3dpp,
&d3d->dev)))
#else
if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice( if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice(
d3d->cur_mon_id, d3d->cur_mon_id,
D3DDEVTYPE_HAL, D3DDEVTYPE_HAL,
@ -650,6 +669,7 @@ static bool d3d_init_base(void *data, const video_info_t *info)
D3DCREATE_SOFTWARE_VERTEXPROCESSING, D3DCREATE_SOFTWARE_VERTEXPROCESSING,
&d3dpp, &d3dpp,
&d3d->dev))) &d3d->dev)))
#endif
{ {
RARCH_ERR("[D3D]: Failed to initialize device.\n"); RARCH_ERR("[D3D]: Failed to initialize device.\n");
return false; return false;
@ -1225,12 +1245,16 @@ static void d3d_free(void *data)
d3d->dev = NULL; d3d->dev = NULL;
g_pD3D = NULL; g_pD3D = NULL;
#ifndef _XBOX
win32_monitor_from_window(); win32_monitor_from_window();
#endif
if (d3d) if (d3d)
delete d3d; delete d3d;
#ifndef _XBOX
win32_destroy_window(); win32_destroy_window();
#endif
} }
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
@ -1379,7 +1403,9 @@ static bool d3d_frame(void *data, const void *frame,
{ {
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;
@ -1391,8 +1417,10 @@ 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))
{ {