mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-12 00:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Don't use std::vector for attrib_map

Browse Source
This commit is contained in:
twinaphex 2015-11-09 22:04:45 +01:00
parent f277fd5323
commit 02d61bf992
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/d3d/render_chain_cg.cpp
View File

@ -53,7 +53,7 @@ struct Pass
CGprogram vPrg, fPrg; CGprogram vPrg, fPrg;
unsigned last_width, last_height; unsigned last_width, last_height;
LPDIRECT3DVERTEXDECLARATION vertex_decl; LPDIRECT3DVERTEXDECLARATION vertex_decl;
std::vector<unsigned> attrib_map; unsigned *attrib_map[MAXD3DDECLLENGTH];
}; };
typedef struct cg_renderchain typedef struct cg_renderchain
@ -458,12 +458,12 @@ static bool cg_d3d9_renderchain_init_shader_fvf(void *data, void *pass_data)
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
if (indices[i]) if (indices[i])
pass->attrib_map.push_back(0); pass->attrib_map[i] = 0;
else else
{ {
D3DVERTEXELEMENT elem = DECL_FVF_TEXCOORD(index, 3, tex_index); D3DVERTEXELEMENT elem = DECL_FVF_TEXCOORD(index, 3, tex_index);
pass->attrib_map.push_back(index); pass->attrib_map[i] = index;
decl[i] = elem; decl[i] = elem;
@ -722,11 +722,21 @@ static void cg_d3d9_renderchain_clear_passes(cg_renderchain_t *chain)
for (i = 1; i < chain->passes.size(); i++) for (i = 1; i < chain->passes.size(); i++)
{ {
unsigned j;
if (chain->passes[i].tex) if (chain->passes[i].tex)
d3d_texture_free(chain->passes[i].tex); d3d_texture_free(chain->passes[i].tex);
for (j = 0; j < MAXD3DDECLLENGTH; j++)
{
if (chain->passes[i].attrib_map[j])
free(chain->passes[i].attrib_map[j]);
chain->passes[i].attrib_map[j] = NULL;
}
d3d_vertex_buffer_free(chain->passes[i].vertex_buf, chain->passes[i].vertex_decl); d3d_vertex_buffer_free(chain->passes[i].vertex_buf, chain->passes[i].vertex_decl);
renderchain_destroy_shader(chain, i); renderchain_destroy_shader(chain, i);
} }
} }
static void cg_d3d9_renderchain_clear(cg_renderchain_t *chain) static void cg_d3d9_renderchain_clear(cg_renderchain_t *chain)
@ -786,6 +796,7 @@ void cg_d3d9_renderchain_free(void *data)
cg_d3d9_renderchain_clear(chain); cg_d3d9_renderchain_clear(chain);
cg_d3d9_renderchain_deinit_shader(chain); cg_d3d9_renderchain_deinit_shader(chain);
cg_d3d9_renderchain_destroy_stock_shader(chain); cg_d3d9_renderchain_destroy_stock_shader(chain);
cg_d3d9_renderchain_deinit(chain); cg_d3d9_renderchain_deinit(chain);
} }
@ -888,6 +899,9 @@ static bool renderchain_create_first_pass(cg_renderchain_t *chain,
chain->prev.ptr = 0; chain->prev.ptr = 0;
for (i = 0; i < MAXD3DDECLLENGTH; i++)
pass.attrib_map[i] = (unsigned*)calloc(1, sizeof(unsigned));
for (i = 0; i < TEXTURES; i++) for (i = 0; i < TEXTURES; i++)
{ {
chain->prev.last_width[i] = 0; chain->prev.last_width[i] = 0;