mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-12 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix gl's and d3d9's set_shader not returning to stock if path is NULL

Browse Source
This commit is contained in:
LazyBumHorse 2019-06-21 13:43:56 +02:00
parent faef9413e3
commit e5421940be
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers/d3d9.c
View File

@ -1816,9 +1816,6 @@ static bool d3d9_set_shader(void *data,
free(d3d->shader_path); free(d3d->shader_path);
d3d->shader_path = NULL; d3d->shader_path = NULL;
if (string_is_empty(path))
return true;
switch (type) switch (type)
{ {
case RARCH_SHADER_CG: case RARCH_SHADER_CG:
@ -1828,7 +1825,6 @@ static bool d3d9_set_shader(void *data,
break; break;
default: default:
RARCH_WARN("[D3D9]: Only Cg shaders are supported. Falling back to stock.\n"); RARCH_WARN("[D3D9]: Only Cg shaders are supported. Falling back to stock.\n");
return false;
} }
if (!d3d9_process_shader(d3d) || !d3d9_restore(d3d)) if (!d3d9_process_shader(d3d) || !d3d9_restore(d3d))

12
gfx/drivers/gl.c
View File

@ -4070,15 +4070,6 @@ static bool gl2_set_shader(void *data,
gl2_context_bind_hw_render(gl, false); gl2_context_bind_hw_render(gl, false);
gl->shader->deinit(gl->shader_data);
gl->shader_data = NULL;
if (string_is_empty(path))
{
gl2_context_bind_hw_render(gl, true);
return true;
}
fallback = gl2_get_fallback_shader_type(type); fallback = gl2_get_fallback_shader_type(type);
if (fallback == RARCH_SHADER_NONE) if (fallback == RARCH_SHADER_NONE)
@ -4087,6 +4078,9 @@ static bool gl2_set_shader(void *data,
goto error; goto error;
} }
gl->shader->deinit(gl->shader_data);
gl->shader_data = NULL;
if (type != fallback) if (type != fallback)
{ {
RARCH_ERR("[GL]: %s shader not supported, falling back to stock %s\n", RARCH_ERR("[GL]: %s shader not supported, falling back to stock %s\n",