From 246e2246267d90c48c099689d112cd8410a34bd6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 26 Apr 2019 02:58:57 +0200 Subject: [PATCH] (menu displaylist) Fix shader preset/shader pass selection --- menu/menu_displaylist.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 6550dc0e92..d3931de51d 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -6956,19 +6956,34 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, { gfx_ctx_flags_t flags; if (video_driver_get_all_flags(&flags, GFX_CTX_FLAGS_SHADERS_CG)) - string_list_append(str_list, "cgp", attr); + { + if (type == DISPLAYLIST_SHADER_PRESET) + string_list_append(str_list, "cgp", attr); + else if (type == DISPLAYLIST_SHADER_PASS) + string_list_append(str_list, "cg", attr); + } } { gfx_ctx_flags_t flags; if (video_driver_get_all_flags(&flags, GFX_CTX_FLAGS_SHADERS_GLSL)) - string_list_append(str_list, "glslp", attr); + { + if (type == DISPLAYLIST_SHADER_PRESET) + string_list_append(str_list, "glslp", attr); + else if (type == DISPLAYLIST_SHADER_PASS) + string_list_append(str_list, "glsl", attr); + } } { gfx_ctx_flags_t flags; if (video_driver_get_all_flags(&flags, GFX_CTX_FLAGS_SHADERS_SLANG)) - string_list_append(str_list, "slangp", attr); + { + if (type == DISPLAYLIST_SHADER_PRESET) + string_list_append(str_list, "slangp", attr); + else if (type == DISPLAYLIST_SHADER_PASS) + string_list_append(str_list, "slang", attr); + } } string_list_join_concat(new_exts, sizeof(new_exts), str_list, "|");