From 50d8520085735912a76eb1e453bc433b0cc39d75 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 12 Sep 2012 15:21:25 +0200 Subject: [PATCH] (Android) Use GLES v2 - codepath for GLES v1 is broken if GL_CLAMP_TO_BORDER is not available --- android/jni/Android.mk | 4 ++-- gfx/context/ps3_ctx.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index bc31f07377..a1094f1218 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -7,8 +7,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := retroarch LOCAL_SRC_FILES = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c -LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99 +LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99 -LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -lGLESv1_CM -llog +LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -lGLESv2 -llog include $(BUILD_SHARED_LIBRARY) diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c index 706b9bb7c1..4a9611f4ea 100644 --- a/gfx/context/ps3_ctx.c +++ b/gfx/context/ps3_ctx.c @@ -32,7 +32,9 @@ #define glOrtho glOrthof #endif +#ifdef HAVE_CG_MENU static struct texture_image menu_texture; +#endif #if defined(HAVE_PSGL) static PSGLdevice* gl_device;