* 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
mme4crt · Mar 1, 2018 · 7da491d · 7da491d
1 parent 8b8b08a
commit 7da491d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -13,10 +13,6 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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
@@ -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)
    {