(D3D8) Simplifications

This commit is contained in:
libretroadmin 2022-05-16 14:19:17 +02:00
parent 3b7ff9d69b
commit 1c1d37e959

View File

@ -112,25 +112,6 @@ void *d3d8_texture_new(LPDIRECT3DDEVICE8 dev,
return NULL;
}
static bool d3d8_reset_internal(LPDIRECT3DDEVICE8 dev,
D3DPRESENT_PARAMETERS *d3dpp
)
{
if (dev &&
IDirect3DDevice8_Reset(dev, d3dpp) == D3D_OK)
return true;
return false;
}
static HRESULT d3d8_test_cooperative_level(LPDIRECT3DDEVICE8 dev)
{
#ifndef _XBOX
if (dev)
return IDirect3DDevice8_TestCooperativeLevel(dev);
#endif
return E_FAIL;
}
static bool d3d8_create_device_internal(
LPDIRECT3DDEVICE8 dev,
D3DPRESENT_PARAMETERS *d3dpp,
@ -173,18 +154,17 @@ bool d3d8_create_device(void *dev,
return true;
}
bool d3d8_reset(void *dev, void *d3dpp)
bool d3d8_reset(void *data, void *d3dpp)
{
const char *err = NULL;
if (d3d8_reset_internal(dev, (D3DPRESENT_PARAMETERS*)d3dpp))
const char *err = NULL;
LPDIRECT3DDEVICE8 dev = (LPDIRECT3DDEVICE8)data;
if (dev && IDirect3DDevice8_Reset(dev, (D3DPRESENT_PARAMETERS*)d3dpp) ==
D3D_OK)
return true;
RARCH_WARN("[D3D]: Attempting to recover from dead state...\n");
#ifndef _XBOX
RARCH_WARN("[D3D]: Attempting to recover from dead state...\n");
/* Try to recreate the device completely. */
switch (d3d8_test_cooperative_level(dev))
switch (IDirect3DDevice8_TestCooperativeLevel(dev))
{
case D3DERR_DEVICELOST:
err = "DEVICELOST";
@ -203,6 +183,5 @@ bool d3d8_reset(void *dev, void *d3dpp)
}
RARCH_WARN("[D3D]: recovering from dead state: (%s).\n", err);
#endif
return false;
}