libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 44 Packages Projects Releases Wiki Activity

(Android) Use GLES v2 - codepath for GLES v1 is broken if

Browse Source 
GL_CLAMP_TO_BORDER is not available
This commit is contained in:
Twinaphex 2012-09-12 15:21:25 +02:00
parent e1fc6d7ab5
commit 50d8520085
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/jni/Android.mk
View File

@ -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)

2
gfx/context/ps3_ctx.c
View File

@ -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;