From e37a4aa46e63bf2c7c7154830ab74c12a8c51d96 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 7 Mar 2015 23:31:16 +0100 Subject: [PATCH] (Menu) Shader Options shouldn't appear on paltforms that don't support it --- menu/menu.h | 6 ++++++ menu/menu_entries_cbs_deferred_push.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/menu/menu.h b/menu/menu.h index 8775439b84..1cc16c7542 100644 --- a/menu/menu.h +++ b/menu/menu.h @@ -26,6 +26,12 @@ #include "../../general.h" #include "menu_input.h" +#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) +#ifndef HAVE_SHADER_MANAGER +#define HAVE_SHADER_MANAGER +#endif +#endif + #ifndef GFX_MAX_SHADERS #define GFX_MAX_SHADERS 16 #endif diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c index a6fb01a97a..76239cf41f 100644 --- a/menu/menu_entries_cbs_deferred_push.c +++ b/menu/menu_entries_cbs_deferred_push.c @@ -33,6 +33,8 @@ #include "menu_database.h" +#include "../gfx/video_shader_driver.h" + #ifdef HAVE_LIBRETRODB static int create_string_list_rdb_entry_string(const char *desc, const char *label, const char *actual_string, const char *path, file_list_t *list) @@ -1254,8 +1256,10 @@ static int deferred_push_options(void *data, void *userdata, } menu_list_push(list, "Video Options", "video_options", MENU_SETTING_ACTION, 0); +#ifdef HAVE_SHADER_MANAGER menu_list_push(list, "Shader Options", "shader_options", MENU_SETTING_ACTION, 0); +#endif if (driver.menu_ctx && driver.menu_ctx->populate_entries) driver.menu_ctx->populate_entries(path, label, type);