diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c index 6c622a479a..1214c9cb58 100644 --- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c +++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c @@ -190,30 +190,30 @@ static bool d3d9_cg_load_program(void *data, CGprofile fragment_profile = cgD3D9GetLatestPixelProfile(); const char **fragment_opts = cgD3D9GetOptimalOptions(fragment_profile); const char **vertex_opts = cgD3D9GetOptimalOptions(vertex_profile); - cg_renderchain_t *chain = (cg_renderchain_t*)data; + cg_renderchain_t *cg_data = (cg_renderchain_t*)data; RARCH_LOG("[D3D Cg]: Vertex profile: %s\n", cgGetProfileString(vertex_profile)); RARCH_LOG("[D3D Cg]: Fragment profile: %s\n", cgGetProfileString(fragment_profile)); if (path_is_file && !string_is_empty(prog)) - *fPrg = cgCreateProgramFromFile(chain->cgCtx, CG_SOURCE, + *fPrg = cgCreateProgramFromFile(cg_data->cgCtx, CG_SOURCE, prog, fragment_profile, "main_fragment", fragment_opts); else - *fPrg = cgCreateProgram(chain->cgCtx, CG_SOURCE, stock_cg_d3d9_program, + *fPrg = cgCreateProgram(cg_data->cgCtx, CG_SOURCE, stock_cg_d3d9_program, fragment_profile, "main_fragment", fragment_opts); - list = cgGetLastListing(chain->cgCtx); + list = cgGetLastListing(cg_data->cgCtx); if (list) listing_f = strdup(list); if (path_is_file && !string_is_empty(prog)) - *vPrg = cgCreateProgramFromFile(chain->cgCtx, CG_SOURCE, + *vPrg = cgCreateProgramFromFile(cg_data->cgCtx, CG_SOURCE, prog, vertex_profile, "main_vertex", vertex_opts); else - *vPrg = cgCreateProgram(chain->cgCtx, CG_SOURCE, stock_cg_d3d9_program, + *vPrg = cgCreateProgram(cg_data->cgCtx, CG_SOURCE, stock_cg_d3d9_program, vertex_profile, "main_vertex", vertex_opts); - list = cgGetLastListing(chain->cgCtx); + list = cgGetLastListing(cg_data->cgCtx); if (list) listing_v = strdup(list); @@ -633,64 +633,64 @@ static void d3d9_cg_renderchain_bind_pass( static void d3d9_cg_deinit_progs(void *data) { unsigned i; - cg_renderchain_t *chain = (cg_renderchain_t*)data; + cg_renderchain_t *cg_data = (cg_renderchain_t*)data; - if (!chain) + if (!cg_data) return; RARCH_LOG("CG: Destroying programs.\n"); - if (chain->passes->count >= 1) + if (cg_data->passes->count >= 1) { - d3d_vertex_buffer_free(NULL, chain->passes->data[0].vertex_decl); + d3d_vertex_buffer_free(NULL, cg_data->passes->data[0].vertex_decl); - for (i = 1; i < chain->passes->count; i++) + for (i = 1; i < cg_data->passes->count; i++) { - if (chain->passes->data[i].tex) - d3d_texture_free(chain->passes->data[i].tex); - chain->passes->data[i].tex = NULL; + if (cg_data->passes->data[i].tex) + d3d_texture_free(cg_data->passes->data[i].tex); + cg_data->passes->data[i].tex = NULL; d3d_vertex_buffer_free( - chain->passes->data[i].vertex_buf, - chain->passes->data[i].vertex_decl); + cg_data->passes->data[i].vertex_buf, + cg_data->passes->data[i].vertex_decl); - if (chain->passes->data[i].fPrg) - cgDestroyProgram(chain->passes->data[i].fPrg); - if (chain->passes->data[i].vPrg) - cgDestroyProgram(chain->passes->data[i].vPrg); + if (cg_data->passes->data[i].fPrg) + cgDestroyProgram(cg_data->passes->data[i].fPrg); + if (cg_data->passes->data[i].vPrg) + cgDestroyProgram(cg_data->passes->data[i].vPrg); } } - if (chain->fStock) - cgDestroyProgram(chain->fStock); - if (chain->vStock) - cgDestroyProgram(chain->vStock); + if (cg_data->fStock) + cgDestroyProgram(cg_data->fStock); + if (cg_data->vStock) + cgDestroyProgram(cg_data->vStock); } static void d3d9_cg_destroy_resources(void *data) { unsigned i; - cg_renderchain_t *chain = (cg_renderchain_t*)data; + cg_renderchain_t *cg_data = (cg_renderchain_t*)data; for (i = 0; i < TEXTURES; i++) { - if (chain->prev.tex[i]) - d3d_texture_free(chain->prev.tex[i]); - if (chain->prev.vertex_buf[i]) - d3d_vertex_buffer_free(chain->prev.vertex_buf[i], NULL); + if (cg_data->prev.tex[i]) + d3d_texture_free(cg_data->prev.tex[i]); + if (cg_data->prev.vertex_buf[i]) + d3d_vertex_buffer_free(cg_data->prev.vertex_buf[i], NULL); } - d3d9_cg_deinit_progs(chain); + d3d9_cg_deinit_progs(cg_data); - for (i = 0; i < chain->luts->count; i++) + for (i = 0; i < cg_data->luts->count; i++) { - if (chain->luts->data[i].tex) - d3d_texture_free(chain->luts->data[i].tex); + if (cg_data->luts->data[i].tex) + d3d_texture_free(cg_data->luts->data[i].tex); } - if (chain->state_tracker) + if (cg_data->state_tracker) { - state_tracker_free(chain->state_tracker); - chain->state_tracker = NULL; + state_tracker_free(cg_data->state_tracker); + cg_data->state_tracker = NULL; } cgD3D9UnloadAllPrograms(); @@ -699,53 +699,50 @@ static void d3d9_cg_destroy_resources(void *data) static void d3d9_cg_deinit_context_state(void *data) { - cg_renderchain_t *chain = (cg_renderchain_t*)data; - if (!chain) - return; - - if (chain->cgCtx) + cg_renderchain_t *cg_data = (cg_renderchain_t*)data; + if (cg_data->cgCtx) { RARCH_LOG("CG: Destroying context.\n"); - cgDestroyContext(chain->cgCtx); + cgDestroyContext(cg_data->cgCtx); } - chain->cgCtx = NULL; + cg_data->cgCtx = NULL; } void d3d9_cg_renderchain_free(void *data) { - cg_renderchain_t *chain = (cg_renderchain_t*)data; + cg_renderchain_t *cg_data = (cg_renderchain_t*)data; - if (!chain) + if (!cg_data) return; - d3d9_cg_destroy_resources(chain); + d3d9_cg_destroy_resources(cg_data); - if (chain->passes) + if (cg_data->passes) { unsigned i; - for (i = 0; i < chain->passes->count; i++) + for (i = 0; i < cg_data->passes->count; i++) { - if (chain->passes->data[i].attrib_map) - free(chain->passes->data[i].attrib_map); + if (cg_data->passes->data[i].attrib_map) + free(cg_data->passes->data[i].attrib_map); } - pass_vector_list_free(chain->passes); + pass_vector_list_free(cg_data->passes); - chain->passes = NULL; + cg_data->passes = NULL; } - lut_info_vector_list_free(chain->luts); - unsigned_vector_list_free(chain->bound_tex); - unsigned_vector_list_free(chain->bound_vert); + lut_info_vector_list_free(cg_data->luts); + unsigned_vector_list_free(cg_data->bound_tex); + unsigned_vector_list_free(cg_data->bound_vert); - chain->luts = NULL; - chain->bound_tex = NULL; - chain->bound_vert = NULL; + cg_data->luts = NULL; + cg_data->bound_tex = NULL; + cg_data->bound_vert = NULL; - d3d9_cg_deinit_context_state(chain); + d3d9_cg_deinit_context_state(cg_data); - free(chain); + free(cg_data); } static void *d3d9_cg_renderchain_new(void) @@ -1561,7 +1558,7 @@ static bool d3d9_cg_renderchain_render( current_width, current_height, chain->final_viewport); if (chain) - d3d_set_viewports(chain->dev, chain->final_viewport); + d3d_set_viewports(chain->dev, &chain->final_viewport); cg_d3d9_renderchain_set_vertices(chain, last_pass, current_width, current_height,