mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-22 16:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9323 from LazyBumHorse/fix_apply_shader

Browse Source 
fix not being able to apply shader if none was loaded before
This commit is contained in:
Twinaphex 2019-08-18 13:08:29 +02:00 committed by GitHub
commit 7f04ecb033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
menu/menu_shader.c
View File

@ -403,17 +403,26 @@ void menu_shader_manager_clear_pass_path(unsigned i)
**/ **/
enum rarch_shader_type menu_shader_manager_get_type(const void *data) enum rarch_shader_type menu_shader_manager_get_type(const void *data)
{ {
unsigned type = RARCH_SHADER_NONE; enum rarch_shader_type type = RARCH_SHADER_NONE;
const struct video_shader *shader = (const struct video_shader*)data; const struct video_shader *shader = (const struct video_shader*)data;
/* All shader types must be the same, or we cannot use it. */ /* All shader types must be the same, or we cannot use it. */
unsigned i = 0; size_t i = 0;
if (!shader) if (!shader)
return RARCH_SHADER_NONE; return RARCH_SHADER_NONE;
type = video_shader_parse_type(shader->path); type = video_shader_parse_type(shader->path);
for (i = 0; i < shader->passes; i++) if (!shader->passes)
return type;
if (type == RARCH_SHADER_NONE)
{
type = video_shader_parse_type(shader->pass[0].source.path);
i = 1;
}
for (; i < shader->passes; i++)
{ {
enum rarch_shader_type pass_type = enum rarch_shader_type pass_type =
video_shader_parse_type(shader->pass[i].source.path); video_shader_parse_type(shader->pass[i].source.path);
@ -424,14 +433,14 @@ enum rarch_shader_type menu_shader_manager_get_type(const void *data)
case RARCH_SHADER_GLSL: case RARCH_SHADER_GLSL:
case RARCH_SHADER_SLANG: case RARCH_SHADER_SLANG:
if (type != pass_type) if (type != pass_type)
return (enum rarch_shader_type)RARCH_SHADER_NONE; return RARCH_SHADER_NONE;
break; break;
default: default:
break; break;
} }
} }
return (enum rarch_shader_type)type; return type;
} }
/** /**