diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c similarity index 96% rename from gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp rename to gfx/drivers_renderchain/d3d9_hlsl_renderchain.c index 8b6284b493..f1cafcd775 100644 --- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp +++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c @@ -75,10 +75,11 @@ static bool hlsl_d3d9_renderchain_init_shader_fvf(void *data, void *pass_data) { 0, 2 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 }, D3DDECL_END() }; - d3d_video_t *d3d = (d3d_video_t*)data; - d3d_video_t *pass = (d3d_video_t*)data; - LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; - hlsl_d3d9_renderchain_t *chain = (hlsl_d3d9_renderchain_t*)d3d->renderchain_data; + d3d_video_t *d3d = (d3d_video_t*)data; + d3d_video_t *pass = (d3d_video_t*)data; + LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; + hlsl_d3d9_renderchain_t *chain = (hlsl_d3d9_renderchain_t*) + d3d->renderchain_data; (void)pass_data; @@ -91,9 +92,11 @@ static bool renderchain_create_first_pass(void *data, { d3d_video_t *d3d = (d3d_video_t*)data; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; - hlsl_d3d9_renderchain_t *chain = (hlsl_d3d9_renderchain_t*)d3d->renderchain_data; + hlsl_d3d9_renderchain_t *chain = (hlsl_d3d9_renderchain_t*) + d3d->renderchain_data; - chain->vertex_buf = d3d_vertex_buffer_new(d3dr, 4 * sizeof(Vertex), + chain->vertex_buf = d3d_vertex_buffer_new( + d3dr, 4 * sizeof(Vertex), D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_MANAGED, NULL); diff --git a/griffin/griffin.c b/griffin/griffin.c index 6df60ea8e1..9b4a08f305 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -329,6 +329,10 @@ VIDEO DRIVER #if defined(HAVE_D3D9) +#ifdef HAVE_HLSL +#include "../gfx/drivers_renderchain/d3d9_hlsl_renderchain.c" +#endif + #ifdef HAVE_CG #include "../gfx/drivers_renderchain/d3d9_cg_renderchain.c" #endif diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index fea06d3cab..620c2002fa 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -116,10 +116,6 @@ UI /*============================================================ VIDEO DRIVER ============================================================ */ -#if defined(HAVE_D3D) && defined(HAVE_D3D9) && defined(HAVE_HLSL) -#include "../gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp" -#endif - #ifdef HAVE_VULKAN #include "../gfx/drivers_shader/shader_vulkan.cpp" #include "../gfx/drivers_shader/glslang_util.cpp"