From 2ec2b70a72f7b4b0221a23b733e3c3ff6239095c Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Sun, 1 Jul 2012 22:44:33 +0200
Subject: [PATCH] (PSL1GHT) Add some GL ES 2.0 hooks

---
 Makefile.psl1ght          |  4 +++-
 console/griffin/griffin.c |  4 +++-
 gfx/gl_common.h           | 16 ++++++++--------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Makefile.psl1ght b/Makefile.psl1ght
index 29ea1fc2c0..40beb0efe5 100644
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@@ -35,7 +35,9 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif
 
-CFLAGS += -std=gnu99 -DHAVE_FILEBROWSER -DHAVE_OPENGLES20 -D__RSX__ -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.6\" -Dmain=rarch_main -Wno-char-subscripts 
+RSXGL_DEFINES = -D__RSX__ -DGL3_PROTOTYPES
+
+CFLAGS += -std=gnu99 -DHAVE_FILEBROWSER -DHAVE_OPENGLES20 $(RSXGL_DEFINES) -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.6\" -Dmain=rarch_main -Wno-char-subscripts 
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 0f42bafe24..eb757827e2 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -84,8 +84,10 @@ VIDEO IMAGE
 VIDEO DRIVER
 ============================================================ */
 
-#ifdef HAVE_OPENGLES11
+#if defined(HAVE_OPENGLES11)
 #include "../../gfx/gl.c"
+#elif defined(HAVE_OPENGLES20)
+#include "../../gfx/gles.c"
 #elif defined(_XBOX360)
 #include "../../360/xdk360_video.cpp"
 #elif defined(GEKKO)
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index c66e2093b3..d4a1404680 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -26,16 +26,16 @@
 #if defined(__APPLE__)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
-#elif defined(__CELLOS_LV2__)
-#if defined(__PSL1GHT__)
-#include <EGL/egl.h>
-#include <GL3/gl3.h>
-#include <GL3/gl3ext.h>
-#else
+#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
 #include <PSGL/psgl.h>
 #include <PSGL/psglu.h>
 #include <GLES/glext.h>
-#endif
+#elif defined(__CELLOS_LV2__) && defined(__PSL1GHT__)
+#include <EGL/egl.h>
+#include <GL3/gl3.h>
+#include <GL3/gl3ext.h>
+#include <GL3/rsxgl_compatibility.h>
+#define GL_QUADS 0x0007
 #else
 #define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
@@ -209,7 +209,7 @@ extern PFNGLACTIVETEXTUREPROC pglActiveTexture;
 #define pglActiveTexture glActiveTexture
 #endif
 
-#ifdef __CELLOS_LV2__
+#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
 #define RARCH_GL_INTERNAL_FORMAT GL_ARGB_SCE
 #define RARCH_GL_TEXTURE_TYPE GL_ARGB_SCE
 #define RARCH_GL_FORMAT32 GL_UNSIGNED_INT_8_8_8_8