diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index 38c04b35d1..6c9ba10086 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -57,7 +57,7 @@ ifeq ($(DEBUG_INPUT), 1) LOCAL_CFLAGS += -DRARCH_INPUT_DEBUG endif -LOCAL_CFLAGS += -Wall -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 +LOCAL_CFLAGS += -Wall -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c index 0f19f18c08..654d593cce 100644 --- a/gfx/shader_glsl.c +++ b/gfx/shader_glsl.c @@ -124,14 +124,8 @@ static PFNGLVERTEXATTRIBPOINTERPROC pglVertexAttribPointer; #endif #define MAX_VARIABLES 256 - -#ifdef RARCH_GPU_PERFORMANCE_MODE -#define MAX_TEXTURES 4 -#define PREV_TEXTURES 3 -#else #define MAX_TEXTURES 8 #define PREV_TEXTURES 7 -#endif enum filter_type { diff --git a/gfx/shader_glsl.h b/gfx/shader_glsl.h index bad89e52ee..3ab47447a6 100644 --- a/gfx/shader_glsl.h +++ b/gfx/shader_glsl.h @@ -20,12 +20,7 @@ #include "../boolean.h" #include "shader_common.h" -#ifdef RARCH_GPU_PERFORMANCE_MODE -#define RARCH_GLSL_MAX_SHADERS 8 -#else #define RARCH_GLSL_MAX_SHADERS 16 -#endif - #define RARCH_GLSL_MENU_SHADER_INDEX (RARCH_GLSL_MAX_SHADERS - 1) bool gl_glsl_init(const char *path);