(Xbox OG) Buildfixes

This commit is contained in:
twinaphex 2018-01-03 13:52:41 +01:00
parent 7a481236bf
commit 777e96f2ea
2 changed files with 5 additions and 4 deletions

View File

@ -57,6 +57,7 @@
#define LPDIRECT3DCUBETEXTURE LPDIRECT3DCUBETEXTURE8 #define LPDIRECT3DCUBETEXTURE LPDIRECT3DCUBETEXTURE8
#define LPDIRECT3DVOLUMETEXTURE LPDIRECT3DVOLUMETEXTURE8 #define LPDIRECT3DVOLUMETEXTURE LPDIRECT3DVOLUMETEXTURE8
#define LPDIRECT3DVERTEXBUFFER LPDIRECT3DVERTEXBUFFER8 #define LPDIRECT3DVERTEXBUFFER LPDIRECT3DVERTEXBUFFER8
#define LPDIRECT3DVERTEXDECLARATION (void*)
#define LPDIRECT3DSURFACE LPDIRECT3DSURFACE8 #define LPDIRECT3DSURFACE LPDIRECT3DSURFACE8
#define LPDIRECT3DRESOURCE LPDIRECT3DRESOURCE8 #define LPDIRECT3DRESOURCE LPDIRECT3DRESOURCE8
#define D3DVERTEXELEMENT D3DVERTEXELEMENT8 #define D3DVERTEXELEMENT D3DVERTEXELEMENT8

View File

@ -217,7 +217,9 @@ void d3d_vertex_declaration_free(void *data)
LPDIRECT3DVERTEXDECLARATION vertex_decl = (LPDIRECT3DVERTEXDECLARATION)data; LPDIRECT3DVERTEXDECLARATION vertex_decl = (LPDIRECT3DVERTEXDECLARATION)data;
if (!vertex_decl) if (!vertex_decl)
return; return;
#if defined(HAVE_D3D9) && !defined(__cplusplus) #if defined(HAVE_D3D8)
/* empty */
#elif defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DVertexDeclaration9_Release(vertex_decl); IDirect3DVertexDeclaration9_Release(vertex_decl);
#else #else
vertex_decl->Release(); vertex_decl->Release();
@ -798,10 +800,8 @@ void d3d_disable_blend_func(void *data)
void d3d_set_vertex_declaration(void *data, void *vertex_data) void d3d_set_vertex_declaration(void *data, void *vertex_data)
{ {
LPDIRECT3DDEVICE dev = (LPDIRECT3DDEVICE)data; LPDIRECT3DDEVICE dev = (LPDIRECT3DDEVICE)data;
#if defined(HAVE_D3D9)
LPDIRECT3DVERTEXDECLARATION decl = (LPDIRECT3DVERTEXDECLARATION)vertex_data; LPDIRECT3DVERTEXDECLARATION decl = (LPDIRECT3DVERTEXDECLARATION)vertex_data;
#endif
if (!dev) if (!dev)
return; return;