ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(D3D) More refactors to do with hiding away vertex declaration 

code in render_chain.cpp
This commit is contained in:
twinaphex 2015-04-05 17:17:18 +02:00
parent aaee638f6d
commit c6458daa0e
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/d3d/d3d_wrapper.cpp
View File

@ -149,20 +149,17 @@ void *d3d_vertex_buffer_lock(LPDIRECT3DVERTEXBUFFER vertbuf)
void d3d_vertex_buffer_free(void *vertex_data, void *vertex_declaration) void d3d_vertex_buffer_free(void *vertex_data, void *vertex_declaration)
{ {
#ifdef HAVE_D3D9 if (vertex_data)
LPDIRECT3DVERTEXDECLARATION vertex_decl = (LPDIRECT3DVERTEXDECLARATION)vertex_declaration;
#endif
LPDIRECT3DVERTEXBUFFER buf = (LPDIRECT3DVERTEXBUFFER)vertex_data;
if (buf)
{ {
LPDIRECT3DVERTEXBUFFER buf = (LPDIRECT3DVERTEXBUFFER)vertex_data;
buf->Release(); buf->Release();
buf = NULL; buf = NULL;
} }
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
if (vertex_decl) if (vertex_declaration)
{ {
LPDIRECT3DVERTEXDECLARATION vertex_decl = (LPDIRECT3DVERTEXDECLARATION)vertex_declaration;
vertex_decl->Release(); vertex_decl->Release();
vertex_decl = NULL; vertex_decl = NULL;
} }

3
gfx/d3d/render_chain.cpp
View File

@ -776,8 +776,7 @@ void renderchain_clear(void *data)
d3d_vertex_buffer_free(chain->prev.vertex_buf[i], NULL); d3d_vertex_buffer_free(chain->prev.vertex_buf[i], NULL);
} }
if (chain->passes[0].vertex_decl) d3d_vertex_buffer_free(NULL, chain->passes[0].vertex_decl);
chain->passes[0].vertex_decl->Release();
for (i = 1; i < chain->passes.size(); i++) for (i = 1; i < chain->passes.size(); i++)
{ {

4
gfx/d3d/render_chain.h
View File

@ -54,9 +54,7 @@ struct Pass
CGprogram vPrg, fPrg; CGprogram vPrg, fPrg;
#endif #endif
unsigned last_width, last_height; unsigned last_width, last_height;
#ifdef HAVE_D3D9 void *vertex_decl;
LPDIRECT3DVERTEXDECLARATION vertex_decl;
#endif
std::vector<unsigned> attrib_map; std::vector<unsigned> attrib_map;
}; };