From 7da491d00968eb8810c7545c7fac6ec9b5013e3e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 1 Mar 2018 17:19:19 +0100 Subject: [PATCH] * menu_shader.c - cleanup * Nothing uses HAVE_SHADERS define anymore, so get rid of it* Nothing uses HAVE_SHADERS define anymore, so get rid of it* Nothing uses HAVE_SHADERS define anymore, so get rid of it* Nothing uses HAVE_SHADERS define anymore, so get rid of it* Nothing uses HAVE_SHADERS define anymore, so get rid of it* Nothing uses HAVE_SHADERS define anymore, so get rid of it* Nothing uses HAVE_SHADERS define anymore, so get rid of it* Nothing uses HAVE_SHADERS define anymore, so get rid of it --- griffin/griffin.c | 4 ---- griffin/griffin_cpp.cpp | 4 ---- menu/menu_shader.c | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/griffin/griffin.c b/griffin/griffin.c index 1fdcaf5e639..511812e5afb 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -17,10 +17,6 @@ #define CINTERFACE #define HAVE_IBXM 1 -#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) -#define HAVE_SHADERS 1 -#endif - #if defined(HAVE_ZLIB) || defined(HAVE_7ZIP) #define HAVE_COMPRESSION 1 #endif diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index 9d5ccf37029..ac200c1f804 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -13,10 +13,6 @@ * If not, see . */ -#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) -#define HAVE_SHADERS 1 -#endif - #if defined(HAVE_ZLIB) || defined(HAVE_7ZIP) #define HAVE_COMPRESSION 1 #endif diff --git a/menu/menu_shader.c b/menu/menu_shader.c index 468fededf59..805af18359f 100644 --- a/menu/menu_shader.c +++ b/menu/menu_shader.c @@ -530,7 +530,7 @@ void menu_shader_manager_apply_changes(void) } /* Fall-back */ - shader_type = video_shader_parse_type("", DEFAULT_SHADER_TYPE); + shader_type = DEFAULT_SHADER_TYPE; if (shader_type == RARCH_SHADER_NONE) {