mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 18:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create d3d_reset

Browse Source
This commit is contained in:
twinaphex 2015-11-14 20:02:55 +01:00
parent 91192f4aca
commit 6d977f08a9
3 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gfx/d3d/d3d.cpp
View File

@ -94,6 +94,10 @@ static void d3d_deinit_chain(d3d_video_t *d3d)
d3d->renderchain_driver = NULL;
d3d->renderchain_data = NULL;
#ifndef _XBOX
d3d->needs_restore = false;
#endif
}
static void d3d_deinitialize(d3d_video_t *d3d)
@ -109,10 +113,6 @@ static void d3d_deinitialize(d3d_video_t *d3d)
font_ctx->free(driver->font_osd_data);
font_ctx = NULL;
d3d_deinit_chain(d3d);
#ifndef _XBOX
d3d->needs_restore = false;
#endif
}
void d3d_make_d3dpp(void *data,
@ -374,37 +374,12 @@ static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info)
d3d_make_d3dpp(d3d, info, &d3dpp);
if (d3d->dev->Reset(&d3dpp) != D3D_OK)
if (!d3d_reset(d3d->dev, &d3dpp))
{
/* Try to recreate the device completely. */
#ifndef _XBOX
HRESULT res = d3d->dev->TestCooperativeLevel();
const char *err = NULL;
switch (res)
{
case D3DERR_DEVICELOST:
err = "DEVICELOST";
break;
case D3DERR_DEVICENOTRESET:
err = "DEVICENOTRESET";
break;
case D3DERR_DRIVERINTERNALERROR:
err = "DRIVERINTERNALERROR";
break;
default:
err = "Unknown";
}
RARCH_WARN(
"[D3D]: Attempting to recover from dead state (%s).\n", err);
#else
RARCH_WARN("[D3D]: Attempting to recover from dead state.\n");
#endif
d3d_deinitialize(d3d);
d3d->g_pD3D->Release();
d3d->g_pD3D = NULL;
ret = d3d_init_base(d3d, info);
if (ret)
RARCH_LOG("[D3D]: Recovered from dead state.\n");

38
gfx/d3d/d3d_wrapper.cpp
View File

@ -517,3 +517,41 @@ void d3d_set_vertex_declaration(void *data, void *vertex_data)
dev->SetVertexDeclaration(decl);
#endif
}
bool d3d_reset(LPDIRECT3DDEVICE dev, D3DPRESENT_PARAMETERS *d3dpp)
{
HRESULT res;
const char *err = NULL;
if (dev->Reset(d3dpp) == D3D_OK)
return true;
/* Try to recreate the device completely. */
#ifndef _XBOX
res = dev->TestCooperativeLevel();
switch (res)
{
case D3DERR_DEVICELOST:
err = "DEVICELOST";
break;
case D3DERR_DEVICENOTRESET:
err = "DEVICENOTRESET";
break;
case D3DERR_DRIVERINTERNALERROR:
err = "DRIVERINTERNALERROR";
break;
default:
err = "Unknown";
}
RARCH_WARN("[D3D]: Attempting to recover from dead state (%s).\n",
err);
#else
RARCH_WARN("[D3D]: Attempting to recover from dead state.\n");
#endif
return false;
}

2
gfx/d3d/d3d_wrapper.h
View File

@ -110,6 +110,8 @@ void d3d_frame_postprocess(void *data);
void d3d_set_render_state(void *data, D3DRENDERSTATETYPE state, DWORD value);
bool d3d_reset(LPDIRECT3DDEVICE dev, D3DPRESENT_PARAMETERS *d3dpp);
#ifdef __cplusplus
}
#endif