(D3D) Some buildfixes

This commit is contained in:
twinaphex 2016-04-23 10:18:46 +02:00
parent 61a71e91e0
commit 38bc378c4d

View File

@ -151,6 +151,8 @@ void d3d_vertex_buffer_unlock(LPDIRECT3DVERTEXBUFFER vertbuf)
vertbuf->Unlock(); vertbuf->Unlock();
#endif #endif
#endif
#endif #endif
} }
@ -369,7 +371,7 @@ void d3d_set_texture(LPDIRECT3DDEVICE dev, unsigned sampler,
+ fetchConstant, D3DTAG_START(D3DTAG_FETCHCONSTANTS) + fetchConstant, D3DTAG_START(D3DTAG_FETCHCONSTANTS)
+ fetchConstant); + fetchConstant);
D3DDevice_SetTexture(dev, sampler, tex, pendingMask3); D3DDevice_SetTexture(dev, sampler, tex, pendingMask3);
#if defined(HAVE_D3D9) && !defined(__cplusplus) #elif defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DDevice9_SetTexture(dev, sampler, tex); IDirect3DDevice9_SetTexture(dev, sampler, tex);
#else #else
dev->SetTexture(sampler, tex); dev->SetTexture(sampler, tex);
@ -505,7 +507,7 @@ void d3d_set_vertex_declaration(void *data, void *vertex_data)
return; return;
#ifdef _XBOX1 #ifdef _XBOX1
d3d_set_vertex_shader(dev, D3DFVF_XYZ | D3DFVF_TEX1, NULL); d3d_set_vertex_shader(dev, D3DFVF_XYZ | D3DFVF_TEX1, NULL);
#if defined(HAVE_D3D9) && !defined(__cplusplus) #elif defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DDevice9_SetVertexDeclaration(dev, decl); IDirect3DDevice9_SetVertexDeclaration(dev, decl);
#elif defined(HAVE_D3D9) #elif defined(HAVE_D3D9)
dev->SetVertexDeclaration(decl); dev->SetVertexDeclaration(decl);