From b6484f80ab6da5d71f0a91861a9a47d6d6ae1f04 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 30 Mar 2014 17:35:22 +0200 Subject: [PATCH] (Menu) RGUI_MAX_SHADERS becomes GFX_MAX_SHADERS --- frontend/menu/menu_common.h | 6 ++++-- frontend/menu/menu_settings.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index 584cd337fe..3d6b598c4a 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -48,7 +48,9 @@ extern "C" { #include "history.h" -#define RGUI_MAX_SHADERS 8 +#ifndef GFX_MAX_SHADERS +#define GFX_MAX_SHADERS 16 +#endif typedef enum { @@ -95,7 +97,7 @@ typedef enum RGUI_SETTINGS_SHADER_0, RGUI_SETTINGS_SHADER_0_FILTER, RGUI_SETTINGS_SHADER_0_SCALE, - RGUI_SETTINGS_SHADER_LAST = RGUI_SETTINGS_SHADER_0_SCALE + (3 * (RGUI_MAX_SHADERS - 1)), + RGUI_SETTINGS_SHADER_LAST = RGUI_SETTINGS_SHADER_0_SCALE + (3 * (GFX_MAX_SHADERS - 1)), RGUI_SETTINGS_SHADER_PRESET_SAVE, // settings options are done here too diff --git a/frontend/menu/menu_settings.c b/frontend/menu/menu_settings.c index 8eed614bec..115d09223b 100644 --- a/frontend/menu/menu_settings.c +++ b/frontend/menu/menu_settings.c @@ -1638,7 +1638,7 @@ int menu_set_settings(void *data, unsigned setting, unsigned action) case RGUI_ACTION_RIGHT: case RGUI_ACTION_OK: - if (rgui->shader.passes < RGUI_MAX_SHADERS) + if (rgui->shader.passes < GFX_MAX_SHADERS) { rgui->shader.passes++; rgui->need_refresh = true;