From f49ea47040912fd27e2abf81526718ba20d55919 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 30 May 2014 22:04:53 +0200 Subject: [PATCH] (RMenu) Implement shader parameter representation logic in RMenu display layer --- frontend/menu/disp/rmenu.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c index 9acba09588..2a719882ca 100644 --- a/frontend/menu/disp/rmenu.c +++ b/frontend/menu/disp/rmenu.c @@ -172,6 +172,10 @@ static void rmenu_render(void) #ifdef HAVE_SHADER_MANAGER else if (menu_type == RGUI_SETTINGS_SHADER_OPTIONS) strlcpy(title, "SHADER OPTIONS", sizeof(title)); + else if (menu_type == RGUI_SETTINGS_SHADER_PARAMETERS) + strlcpy(title, "SHADER PARAMETERS (CURRENT)", sizeof(title)); + else if (menu_type == RGUI_SETTINGS_SHADER_PRESET_PARAMETERS) + strlcpy(title, "SHADER PARAMETERS (RGUI PRESET)", sizeof(title)); #endif else if (menu_type == RGUI_SETTINGS_AUDIO_OPTIONS) strlcpy(title, "AUDIO OPTIONS", sizeof(title)); @@ -332,13 +336,18 @@ static void rmenu_render(void) strlcpy(type_str, "(DIR)", sizeof(type_str)); w = 5; } - else if (type == RGUI_SETTINGS_SHADER_OPTIONS || type == RGUI_SETTINGS_SHADER_PRESET) + else if (type == RGUI_SETTINGS_SHADER_OPTIONS || type == RGUI_SETTINGS_SHADER_PRESET || type == RGUI_SETTINGS_SHADER_PARAMETERS || type == RGUI_SETTINGS_SHADER_PRESET_PARAMETERS) strlcpy(type_str, "...", sizeof(type_str)); else if (type == RGUI_SETTINGS_SHADER_FILTER) snprintf(type_str, sizeof(type_str), "%s", g_settings.video.smooth ? "Linear" : "Nearest"); else if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_get_str) - driver.menu_ctx->backend->shader_manager_get_str(&rgui->shader, type_str, sizeof(type_str), type); + { + if (type >= RGUI_SETTINGS_SHADER_PARAMETER_0 && type <= RGUI_SETTINGS_SHADER_PARAMETER_LAST) + driver.menu_ctx->backend->shader_manager_get_str(rgui->parameter_shader, type_str, sizeof(type_str), type); + else + driver.menu_ctx->backend->shader_manager_get_str(&rgui->shader, type_str, sizeof(type_str), type); + } } else #endif