mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 18:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android GLSL) MAX_PROGRAMS 8 instead of 16, MAX_TEXTURES 4 instead

Browse Source 
of 8, PREV_TEXTURES 3 instead of 7
This commit is contained in:
twinaphex 2012-11-03 09:35:18 +01:00
parent a3c14626a4
commit e0e5e8cb1b
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/native/jni/Android.mk
View File

@ -27,7 +27,7 @@ ifeq ($(PERF_TEST), 1)
LOCAL_CFLAGS += -DPERF_TEST LOCAL_CFLAGS += -DPERF_TEST
endif endif
LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz

9
gfx/shader_glsl.c
View File

@ -119,10 +119,17 @@ static PFNGLVERTEXATTRIBPOINTERPROC pglVertexAttribPointer;
#define BORDER_FUNC GL_CLAMP_TO_BORDER #define BORDER_FUNC GL_CLAMP_TO_BORDER
#endif #endif
#define MAX_VARIABLES 256
#ifdef RARCH_GPU_PERFORMANCE_MODE
#define MAX_PROGRAMS 8
#define MAX_TEXTURES 4
#define PREV_TEXTURES 3
#else
#define MAX_PROGRAMS 16 #define MAX_PROGRAMS 16
#define MAX_TEXTURES 8 #define MAX_TEXTURES 8
#define MAX_VARIABLES 256
#define PREV_TEXTURES 7 #define PREV_TEXTURES 7
#endif
enum filter_type enum filter_type
{ {

4
retroarch.c
View File

@ -52,9 +52,11 @@
// We want to use -mconsole in Win32, so we need main(). // We want to use -mconsole in Win32, so we need main().
#endif #endif
#if defined(RARCH_CONSOLE) || defined(ANDROID) #if defined(RARCH_CONSOLE)
#ifndef RARCH_PERFORMANCE_MODE
#define RARCH_PERFORMANCE_MODE #define RARCH_PERFORMANCE_MODE
#endif #endif
#endif
// To avoid continous switching if we hold the button down, we require that the button must go from pressed, unpressed back to pressed to be able to toggle between then. // To avoid continous switching if we hold the button down, we require that the button must go from pressed, unpressed back to pressed to be able to toggle between then.
static void set_fast_forward_button(bool new_button_state, bool new_hold_button_state) static void set_fast_forward_button(bool new_button_state, bool new_hold_button_state)