mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-26 09:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D Cg) move cgCtx to renderchain data struct

Browse Source
This commit is contained in:
twinaphex 2015-04-07 03:20:57 +02:00
parent 66ecd60da1
commit a029c678d8
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/d3d/d3d.cpp
View File

@ -878,7 +878,7 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
RARCH_LOG("Renderchain driver: %s\n", d3d->renderchain_driver->ident);
if (!d3d->renderchain_driver->init_shader(d3d))
if (!d3d->renderchain_driver->init_shader(d3d, d3d->renderchain_data))
{
RARCH_ERR("Failed to initialize shader subsystem.\n");
return false;

51
gfx/d3d/render_chain_cg.cpp
View File

@ -69,10 +69,9 @@ typedef struct cg_renderchain
unsigned frame_count;
std::vector<unsigned> bound_tex;
std::vector<unsigned> bound_vert;
CGcontext cgCtx;
} cg_renderchain_t;
static CGcontext cgCtx;
static INLINE D3DTEXTUREFILTERTYPE translate_filter(unsigned type)
{
settings_t *settings = config_get_ptr();
@ -199,33 +198,33 @@ static bool renderchain_compile_shaders(void *data,
if (shader.length() > 0)
{
RARCH_LOG("[D3D Cg]: Compiling shader: %s.\n", shader.c_str());
*fPrg = cgCreateProgramFromFile(cgCtx, CG_SOURCE,
*fPrg = cgCreateProgramFromFile(chain->cgCtx, CG_SOURCE,
shader.c_str(), fragment_profile, "main_fragment", fragment_opts);
if (cgGetLastListing(cgCtx))
RARCH_ERR("[D3D Cg]: Fragment error:\n%s\n", cgGetLastListing(cgCtx));
if (cgGetLastListing(chain->cgCtx))
RARCH_ERR("[D3D Cg]: Fragment error:\n%s\n", cgGetLastListing(chain->cgCtx));
*vPrg = cgCreateProgramFromFile(cgCtx, CG_SOURCE,
*vPrg = cgCreateProgramFromFile(chain->cgCtx, CG_SOURCE,
shader.c_str(), vertex_profile, "main_vertex", vertex_opts);
if (cgGetLastListing(cgCtx))
RARCH_ERR("[D3D Cg]: Vertex error:\n%s\n", cgGetLastListing(cgCtx));
if (cgGetLastListing(chain->cgCtx))
RARCH_ERR("[D3D Cg]: Vertex error:\n%s\n", cgGetLastListing(chain->cgCtx));
}
else
{
RARCH_LOG("[D3D Cg]: Compiling stock shader.\n");
*fPrg = cgCreateProgram(cgCtx, CG_SOURCE, stock_program,
*fPrg = cgCreateProgram(chain->cgCtx, CG_SOURCE, stock_program,
fragment_profile, "main_fragment", fragment_opts);
if (cgGetLastListing(cgCtx))
RARCH_ERR("[D3D Cg]: Fragment error:\n%s\n", cgGetLastListing(cgCtx));
if (cgGetLastListing(chain->cgCtx))
RARCH_ERR("[D3D Cg]: Fragment error:\n%s\n", cgGetLastListing(chain->cgCtx));
*vPrg = cgCreateProgram(cgCtx, CG_SOURCE, stock_program,
*vPrg = cgCreateProgram(chain->cgCtx, CG_SOURCE, stock_program,
vertex_profile, "main_vertex", vertex_opts);
if (cgGetLastListing(cgCtx))
RARCH_ERR("[D3D Cg]: Vertex error:\n%s\n", cgGetLastListing(cgCtx));
if (cgGetLastListing(chain->cgCtx))
RARCH_ERR("[D3D Cg]: Vertex error:\n%s\n", cgGetLastListing(chain->cgCtx));
}
if (!fPrg || !vPrg)
@ -739,15 +738,16 @@ static void cg_d3d9_renderchain_clear(void *data)
chain->luts.clear();
}
static void cg_d3d9_renderchain_deinit_shader(void)
static void cg_d3d9_renderchain_deinit_shader(void *data)
{
if (!cgCtx)
cg_renderchain_t *chain = (cg_renderchain_t*)data;
if (!chain->cgCtx)
return;
cgD3D9UnloadAllPrograms();
cgD3D9SetDevice(NULL);
cgDestroyContext(cgCtx);
cgCtx = NULL;
cgDestroyContext(chain->cgCtx);
chain->cgCtx = NULL;
}
static void cg_d3d9_renderchain_deinit(void *data)
@ -765,7 +765,7 @@ void cg_d3d9_renderchain_free(void *data)
if (!chain)
return;
cg_d3d9_renderchain_deinit_shader();
cg_d3d9_renderchain_deinit_shader(chain);
#if 0
cg_d3d9_renderchain_clear(chain);
cg_d3d9_renderchain_destroy_stock_shader(chain);
@ -784,16 +784,17 @@ void *cg_d3d9_renderchain_new(void)
return renderchain;
}
static bool cg_d3d9_renderchain_init_shader(void *data)
static bool cg_d3d9_renderchain_init_shader(void *data,
void *renderchain_data)
{
d3d_video_t *d3d = (d3d_video_t*)data;
d3d_video_t *d3d = (d3d_video_t*)data;
cg_renderchain_t *renderchain = (cg_renderchain_t*)renderchain_data;
if (!d3d)
if (!d3d || !renderchain)
return false;
cgCtx = cgCreateContext();
if (!cgCtx)
renderchain->cgCtx = cgCreateContext();
if (!renderchain->cgCtx)
return false;
RARCH_LOG("[D3D]: Created shader context.\n");

2
gfx/d3d/render_chain_driver.h
View File

@ -40,7 +40,7 @@ typedef struct renderchain_driver
{
void (*chain_free)(void *data);
void *(*chain_new)(void);
bool (*init_shader)(void *data);
bool (*init_shader)(void *data, void *renderchain_data);
bool (*init_shader_fvf)(void *data, void *pass_data);
bool (*reinit)(void *data, const void *info_data);
bool (*init)(void *data,