libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-03-03 07:18:56 +00:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Create d3d_vertex_declaration_free - wrap more D3D functions

Browse Source
This commit is contained in:
twinaphex 2017-10-01 22:23:04 +02:00
parent 55a2020c07
commit ff40cba3de
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/common/d3d_common.cpp
View File

@ -113,6 +113,19 @@ void d3d_texture_free(LPDIRECT3DTEXTURE tex)
}
}
void d3d_vertex_declaration_free(void *data)
{
LPDIRECT3DVERTEXDECLARATION vertex_decl = (LPDIRECT3DVERTEXDECLARATION)data;
if (!vertex_decl)
return;
#if defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DVertexDeclaration9_Release(vertex_decl);
#else
vertex_decl->Release();
#endif
}
bool d3d_vertex_declaration_new(LPDIRECT3DDEVICE dev,
const void *vertex_data, void **decl_data)
{
@ -220,11 +233,7 @@ void d3d_vertex_buffer_free(void *vertex_data, void *vertex_declaration)
if (vertex_declaration)
{
LPDIRECT3DVERTEXDECLARATION vertex_decl = (LPDIRECT3DVERTEXDECLARATION)vertex_declaration;
#if defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DVertexDeclaration9_Release(vertex_decl);
#else
vertex_decl->Release();
#endif
d3d_vertex_declaration_free(vertex_decl);
vertex_decl = NULL;
}
#endif

2
gfx/common/d3d_common.h
View File

@ -94,6 +94,8 @@ void d3d_texture_blit(unsigned pixel_size,
bool d3d_vertex_declaration_new(LPDIRECT3DDEVICE dev,
const void *vertex_data, void **decl_data);
void d3d_vertex_declaration_free(void *data);
void d3d_set_viewports(LPDIRECT3DDEVICE dev, D3DVIEWPORT *vp);
void d3d_enable_blend_func(void *data);

4
gfx/drivers/d3d.cpp
View File

@ -418,9 +418,9 @@ static void d3d_overlay_render(d3d_video_t *d3d, video_frame_info_t *video_info,
D3DDECLUSAGE_COLOR, 0},
D3DDECL_END()
};
d3d->dev->CreateVertexDeclaration(vElems, &vertex_decl);
d3d_vertex_declaration_new(d3d->dev, &vElems, (void**)&vertex_decl);
d3d_set_vertex_declaration(d3d->dev, vertex_decl);
vertex_decl->Release();
d3d_vertex_declaration_free(vertex_decl);
}
#endif

7
gfx/drivers_renderchain/d3d9_cg_renderchain.cpp
View File

@ -409,11 +409,8 @@ static bool d3d9_cg_renderchain_init_shader_fvf(void *data, void *pass_data)
}
}
if (FAILED(chain->dev->CreateVertexDeclaration(
decl, &pass->vertex_decl)))
return false;
return true;
return d3d_vertex_declaration_new(chain->dev,
decl, (void**)&pass->vertex_decl);
}
static void d3d9_cg_renderchain_bind_orig(cg_renderchain_t *chain,