mirror of
https://github.com/libretro/RetroArch
synced 2025-04-07 13:23:32 +00:00
(d3d_common.c) With D3D9 Xbox 360, these functions don't
return anything
This commit is contained in:
parent
b7bbf368fe
commit
983617372a
@ -382,8 +382,12 @@ bool d3d_get_adapter_display_mode(LPDIRECT3D d3d,
|
|||||||
bool d3d_swap(void *data, LPDIRECT3DDEVICE dev)
|
bool d3d_swap(void *data, LPDIRECT3DDEVICE dev)
|
||||||
{
|
{
|
||||||
#if defined(HAVE_D3D9) && !defined(__cplusplus)
|
#if defined(HAVE_D3D9) && !defined(__cplusplus)
|
||||||
|
#ifdef _XBOX
|
||||||
|
IDirect3DDevice9_Present(dev, NULL, NULL, NULL, NULL);
|
||||||
|
#else
|
||||||
if (IDirect3DDevice9_Present(dev, NULL, NULL, NULL, NULL) == D3DERR_DEVICELOST)
|
if (IDirect3DDevice9_Present(dev, NULL, NULL, NULL, NULL) == D3DERR_DEVICELOST)
|
||||||
return false;
|
return false;
|
||||||
|
#endif
|
||||||
#elif defined(HAVE_D3D8) && !defined(__cplusplus)
|
#elif defined(HAVE_D3D8) && !defined(__cplusplus)
|
||||||
if (IDirect3DDevice8_Present(dev, NULL, NULL, NULL, NULL) == D3DERR_DEVICELOST)
|
if (IDirect3DDevice8_Present(dev, NULL, NULL, NULL, NULL) == D3DERR_DEVICELOST)
|
||||||
return false;
|
return false;
|
||||||
@ -972,8 +976,12 @@ bool d3d_lock_rectangle(LPDIRECT3DTEXTURE tex,
|
|||||||
unsigned rectangle_height, unsigned flags)
|
unsigned rectangle_height, unsigned flags)
|
||||||
{
|
{
|
||||||
#if defined(HAVE_D3D9) && !defined(__cplusplus)
|
#if defined(HAVE_D3D9) && !defined(__cplusplus)
|
||||||
|
#ifdef _XBOX
|
||||||
|
IDirect3DTexture9_LockRect(tex, level, lock_rect, (const RECT*)rect, flags);
|
||||||
|
#else
|
||||||
if (IDirect3DTexture9_LockRect(tex, level, lock_rect, (const RECT*)rect, flags) != D3D_OK)
|
if (IDirect3DTexture9_LockRect(tex, level, lock_rect, (const RECT*)rect, flags) != D3D_OK)
|
||||||
return false;
|
return false;
|
||||||
|
#endif
|
||||||
#elif defined(HAVE_D3D8) && !defined(__cplusplus)
|
#elif defined(HAVE_D3D8) && !defined(__cplusplus)
|
||||||
if (IDirect3DTexture8_LockRect(tex, level, lock_rect, rect, flags) != D3D_OK)
|
if (IDirect3DTexture8_LockRect(tex, level, lock_rect, rect, flags) != D3D_OK)
|
||||||
return false;
|
return false;
|
||||||
@ -1129,8 +1137,12 @@ bool d3d_set_vertex_shader(LPDIRECT3DDEVICE dev, unsigned index,
|
|||||||
return false;
|
return false;
|
||||||
#elif defined(HAVE_D3D9) && !defined(__cplusplus)
|
#elif defined(HAVE_D3D9) && !defined(__cplusplus)
|
||||||
LPDIRECT3DVERTEXSHADER shader = (LPDIRECT3DVERTEXSHADER)data;
|
LPDIRECT3DVERTEXSHADER shader = (LPDIRECT3DVERTEXSHADER)data;
|
||||||
|
#ifdef _XBOX
|
||||||
|
IDirect3DDevice9_SetVertexShader(dev, shader);
|
||||||
|
#else
|
||||||
if (IDirect3DDevice9_SetVertexShader(dev, shader) != D3D_OK)
|
if (IDirect3DDevice9_SetVertexShader(dev, shader) != D3D_OK)
|
||||||
return false;
|
return false;
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
LPDIRECT3DVERTEXSHADER shader = (LPDIRECT3DVERTEXSHADER)data;
|
LPDIRECT3DVERTEXSHADER shader = (LPDIRECT3DVERTEXSHADER)data;
|
||||||
if (dev->SetVertexShader(shader) != D3D_OK)
|
if (dev->SetVertexShader(shader) != D3D_OK)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user