mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-11-06 19:39:21 +01:00
parent 13e0bd1932
commit 40a7755fe2
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/gl_common.h
View File

@ -171,6 +171,8 @@ typedef struct gl
#ifdef HAVE_GL_SYNC #ifdef HAVE_GL_SYNC
GLsync fences[MAX_FENCES]; GLsync fences[MAX_FENCES];
#endif #endif
const gl_renderchain_driver_t *renderchain_driver;
void *renderchain_data;
} gl_t; } gl_t;
bool gl_load_luts(const struct video_shader *generic_shader, bool gl_load_luts(const struct video_shader *generic_shader,

47
gfx/drivers/d3d.c
View File

@ -68,28 +68,6 @@
static LPDIRECT3D g_pD3D; static LPDIRECT3D g_pD3D;
static bool d3d_init_luts(d3d_video_t *d3d)
{
unsigned i;
settings_t *settings = config_get_ptr();
if (!d3d->renderchain_driver || !d3d->renderchain_driver->add_lut)
return true;
for (i = 0; i < d3d->shader.luts; i++)
{
if (!d3d->renderchain_driver->add_lut(
d3d->renderchain_data,
d3d->shader.lut[i].id, d3d->shader.lut[i].path,
d3d->shader.lut[i].filter == RARCH_FILTER_UNSPEC ?
settings->bools.video_smooth :
(d3d->shader.lut[i].filter == RARCH_FILTER_LINEAR)))
return false;
}
return true;
}
static bool d3d_init_imports(d3d_video_t *d3d) static bool d3d_init_imports(d3d_video_t *d3d)
{ {
retro_ctx_memory_info_t mem_info; retro_ctx_memory_info_t mem_info;
@ -98,8 +76,6 @@ static bool d3d_init_imports(d3d_video_t *d3d)
if (!d3d->shader.variables) if (!d3d->shader.variables)
return true; return true;
if (!d3d->renderchain_driver || !d3d->renderchain_driver->add_state_tracker)
return true;
mem_info.id = RETRO_MEMORY_SYSTEM_RAM; mem_info.id = RETRO_MEMORY_SYSTEM_RAM;
@ -205,16 +181,37 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
} }
#endif #endif
if (!d3d_init_luts(d3d)) if (d3d->renderchain_driver)
{
if (d3d->renderchain_driver->add_lut)
{
unsigned i;
settings_t *settings = config_get_ptr();
for (i = 0; i < d3d->shader.luts; i++)
{
if (!d3d->renderchain_driver->add_lut(
d3d->renderchain_data,
d3d->shader.lut[i].id, d3d->shader.lut[i].path,
d3d->shader.lut[i].filter == RARCH_FILTER_UNSPEC ?
settings->bools.video_smooth :
(d3d->shader.lut[i].filter == RARCH_FILTER_LINEAR)))
{ {
RARCH_ERR("[D3D]: Failed to init LUTs.\n"); RARCH_ERR("[D3D]: Failed to init LUTs.\n");
return false; return false;
} }
}
}
if (d3d->renderchain_driver->add_state_tracker)
{
if (!d3d_init_imports(d3d)) if (!d3d_init_imports(d3d))
{ {
RARCH_ERR("[D3D]: Failed to init imports.\n"); RARCH_ERR("[D3D]: Failed to init imports.\n");
return false; return false;
} }
}
}
return true; return true;
} }