diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp index 415c4d6050..43f18adb8e 100644 --- a/gfx/d3d/render_chain_cg.cpp +++ b/gfx/d3d/render_chain_cg.cpp @@ -74,7 +74,8 @@ typedef struct cg_renderchain } prev; std::vector passes; CGprogram vStock, fStock; - std::vector luts; + lut_info *luts[GFX_MAX_TEXTURES]; + unsigned luts_count; D3DVIEWPORT *final_viewport; unsigned frame_count; std::vector bound_tex; @@ -605,11 +606,11 @@ static void cg_d3d9_renderchain_add_lut(void *data, if (!chain) return; - d3d_set_texture(chain->dev, index, chain->luts[i].tex); + d3d_set_texture(chain->dev, index, chain->luts[i]->tex); d3d_set_sampler_magfilter(chain->dev, index, - translate_filter(chain->luts[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST)); + translate_filter(chain->luts[i]->smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST)); d3d_set_sampler_minfilter(chain->dev, index, - translate_filter(chain->luts[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST)); + translate_filter(chain->luts[i]->smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST)); d3d_set_sampler_address_u(chain->dev, index, D3DTADDRESS_BORDER); d3d_set_sampler_address_v(chain->dev, index, D3DTADDRESS_BORDER); chain->bound_tex.push_back(index); @@ -620,10 +621,10 @@ static void renderchain_bind_luts(cg_renderchain_t *chain, { unsigned i, index; - for (i = 0; i < chain->luts.size(); i++) + for (i = 0; i < chain->luts_count; i++) { CGparameter vparam; - CGparameter fparam = cgGetNamedParameter(pass->fPrg, chain->luts[i].id); + CGparameter fparam = cgGetNamedParameter(pass->fPrg, chain->luts[i]->id); int bound_index = -1; if (fparam) @@ -634,7 +635,7 @@ static void renderchain_bind_luts(cg_renderchain_t *chain, cg_d3d9_renderchain_add_lut(chain, index, i); } - vparam = cgGetNamedParameter(pass->vPrg, chain->luts[i].id); + vparam = cgGetNamedParameter(pass->vPrg, chain->luts[i]->id); if (vparam) { @@ -739,11 +740,12 @@ static void cg_d3d9_renderchain_clear(cg_renderchain_t *chain) cg_d3d9_renderchain_clear_passes(chain); - for (i = 0; i < chain->luts.size(); i++) + for (i = 0; i < chain->luts_count; i++) { - if (chain->luts[i].tex) - d3d_texture_free(chain->luts[i].tex); - chain->luts[i].tex = NULL; + if (chain->luts[i]->tex) + d3d_texture_free(chain->luts[i]->tex); + chain->luts[i]->tex = NULL; + chain->luts_count--; } #if 0 @@ -1130,7 +1132,6 @@ static bool cg_d3d9_renderchain_add_pass(void *data, const void *info_data) static bool cg_d3d9_renderchain_add_lut(void *data, const char *id, const char *path, bool smooth) { - lut_info info; cg_renderchain_t *chain = (cg_renderchain_t*)data; LPDIRECT3DDEVICE d3dr = chain->dev; LPDIRECT3DTEXTURE lut = d3d_texture_new(d3dr, @@ -1150,9 +1151,6 @@ static bool cg_d3d9_renderchain_add_lut(void *data, RARCH_LOG("[D3D]: LUT texture loaded: %s.\n", path); - info.tex = lut; - info.smooth = smooth; - strlcpy(info.id, id, sizeof(info.id)); if (!lut) return false; @@ -1161,7 +1159,17 @@ static bool cg_d3d9_renderchain_add_lut(void *data, d3d_set_sampler_address_v(d3dr, 0, D3DTADDRESS_BORDER); d3d_set_texture(d3dr, 0, NULL); - chain->luts.push_back(info); + chain->luts[chain->luts_count] = malloc(sizeof(lut_info)); + + if (!chain->luts[chain->luts_count]) + return false; + + chain->luts[chain->luts_count]->tex = lut; + chain->luts[chain->luts_count]->smooth = smooth; + strlcpy(chain->luts[chain->luts_count]->id, id, sizeof(chain->luts[chain->luts_count]->id)); + + chain->luts_count++; + return true; }