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

Start using video_shader_driver_init for D3D too

Browse Source
This commit is contained in:
twinaphex 2015-12-04 15:53:02 +01:00
parent 11109a198b
commit 3f6540dd58
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/d3d/render_chain_xdk.cpp
View File

@ -306,10 +306,7 @@ static bool xdk_renderchain_init_shader(void *data, void *renderchain_data)
shader_path = settings->video.shader_path; shader_path = settings->video.shader_path;
d3d->shader = &hlsl_backend; d3d->shader = &hlsl_backend;
if (!d3d->shader) return video_shader_driver_init(d3d->shader, d3d, shader_path);
return false;
return d3d->shader->init(d3d, shader_path);
#endif #endif
return true; return true;

4
gfx/drivers/gl.c
View File

@ -275,12 +275,12 @@ static bool gl_shader_init(gl_t *gl)
gl->shader = backend; gl->shader = backend;
ret = video_shader_init(gl->shader, gl, shader_path); ret = video_shader_driver_init(gl->shader, gl, shader_path);
if (!ret) if (!ret)
{ {
RARCH_ERR("[GL]: Failed to initialize shader, falling back to stock.\n"); RARCH_ERR("[GL]: Failed to initialize shader, falling back to stock.\n");
ret = video_shader_init(gl->shader, gl, NULL); ret = video_shader_driver_init(gl->shader, gl, NULL);
} }
return ret; return ret;

2
gfx/video_shader_driver.c
View File

@ -93,7 +93,7 @@ void video_shader_scale(unsigned idx,
shader->shader_scale(idx, scale); shader->shader_scale(idx, scale);
} }
bool video_shader_init(const shader_backend_t *shader, void *data, const char *path) bool video_shader_driver_init(const shader_backend_t *shader, void *data, const char *path)
{ {
if (!shader || !shader->init) if (!shader || !shader->init)
return false; return false;

2
gfx/video_shader_driver.h
View File

@ -116,7 +116,7 @@ const shader_backend_t *shader_ctx_init_first(void);
struct video_shader *video_shader_driver_get_current_shader(void); struct video_shader *video_shader_driver_get_current_shader(void);
bool video_shader_init(const shader_backend_t *shader, void *data, const char *path); bool video_shader_driver_init(const shader_backend_t *shader, void *data, const char *path);
#ifdef __cplusplus #ifdef __cplusplus
} }