ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove d3d->d3d_err

This commit is contained in:
twinaphex 2017-10-02 01:41:23 +02:00
parent cf9147ff66
commit 6b1a1272a7
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/drivers/d3d.cpp
View File

@ -621,6 +621,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;
HRESULT d3d_err;
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
d3d_make_d3dpp(d3d, info, &d3dpp); d3d_make_d3dpp(d3d, info, &d3dpp);
@ -637,7 +638,7 @@ static bool d3d_init_base(void *data, const video_info_t *info)
#endif #endif
#ifdef _XBOX #ifdef _XBOX
if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice( if (FAILED(d3d_err = g_pD3D->CreateDevice(
d3d->cur_mon_id, d3d->cur_mon_id,
D3DDEVTYPE_HAL, D3DDEVTYPE_HAL,
NULL, NULL,
@ -645,7 +646,7 @@ static bool d3d_init_base(void *data, const video_info_t *info)
&d3dpp, &d3dpp,
&d3d->dev))) &d3d->dev)))
#else #else
if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice( if (FAILED(d3d_err = g_pD3D->CreateDevice(
d3d->cur_mon_id, d3d->cur_mon_id,
D3DDEVTYPE_HAL, D3DDEVTYPE_HAL,
win32_get_window(), win32_get_window(),
@ -655,10 +656,10 @@ static bool d3d_init_base(void *data, const video_info_t *info)
#endif #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_err);
#ifdef _XBOX #ifdef _XBOX
if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice( if (FAILED(d3d_err = g_pD3D->CreateDevice(
d3d->cur_mon_id, d3d->cur_mon_id,
D3DDEVTYPE_HAL, D3DDEVTYPE_HAL,
NULL, NULL,
@ -666,7 +667,7 @@ static bool d3d_init_base(void *data, const video_info_t *info)
&d3dpp, &d3dpp,
&d3d->dev))) &d3d->dev)))
#else #else
if (FAILED(d3d->d3d_err = g_pD3D->CreateDevice( if (FAILED(d3d_err = g_pD3D->CreateDevice(
d3d->cur_mon_id, d3d->cur_mon_id,
D3DDEVTYPE_HAL, D3DDEVTYPE_HAL,
win32_get_window(), win32_get_window(),

2
gfx/drivers/d3d.h
View File

@ -79,8 +79,6 @@ typedef struct d3d_video
unsigned cur_mon_id; unsigned cur_mon_id;
unsigned dev_rotation; unsigned dev_rotation;
HRESULT d3d_err;
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
overlay_t *menu; overlay_t *menu;
#endif #endif