From 34bcb938b83a6f657ab74352f7cc8de1d265b137 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Sun, 1 Jul 2012 22:31:44 +0200
Subject: [PATCH] (PS3) Use HAVE_OPENGLES11 for PS3 RGL/PSGL driver

---
 Makefile.ps3.retroarch    | 2 +-
 Makefile.psl1ght          | 2 +-
 console/griffin/griffin.c | 2 +-
 gfx/context/ps3_ctx.c     | 2 +-
 gfx/gl.c                  | 4 +++-
 gfx/gles.c                | 2 ++
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile.ps3.retroarch b/Makefile.ps3.retroarch
index f88e0e683b..f39189d309 100644
--- a/Makefile.ps3.retroarch
+++ b/Makefile.ps3.retroarch
@@ -41,7 +41,7 @@ else
 	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
 endif
 
-DEFINES += -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OPENGL_TEXREF -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_CG -DHAVE_CG_MENU -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+DEFINES += -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OPENGL_TEXREF -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES11 -DHAVE_CG -DHAVE_CG_MENU -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
 
 ifeq ($(DEBUG), 1)
    PPU_OPTIMIZE_LV	:= -O0 -g
diff --git a/Makefile.psl1ght b/Makefile.psl1ght
index d914f48a4b..29ea1fc2c0 100644
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@@ -35,7 +35,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif
 
-CFLAGS += -std=gnu99 -DHAVE_FILEBROWSER -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 
+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 
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 61ca9cec60..0f42bafe24 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -84,7 +84,7 @@ VIDEO IMAGE
 VIDEO DRIVER
 ============================================================ */
 
-#ifdef HAVE_OPENGL
+#ifdef HAVE_OPENGLES11
 #include "../../gfx/gl.c"
 #elif defined(_XBOX360)
 #include "../../360/xdk360_video.cpp"
diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c
index 2db8ac9108..44e1e55cbd 100644
--- a/gfx/context/ps3_ctx.c
+++ b/gfx/context/ps3_ctx.c
@@ -30,7 +30,7 @@
 
 #include "ps3_ctx.h"
 
-#ifdef HAVE_OPENGLES
+#ifdef HAVE_OPENGLES11
 #define glOrtho glOrthof
 #endif
 
diff --git a/gfx/gl.c b/gfx/gl.c
index 3b2b7a4fda..a97cbb19ce 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -13,6 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/* Legacy FF OpenGL / OpenGL ES 1.1 driver */
+
 #include "../driver.h"
 
 #include <stdint.h>
@@ -106,7 +108,7 @@ static bool load_fbo_proc(void)
    return pglGenFramebuffers && pglBindFramebuffer && pglFramebufferTexture2D && 
       pglCheckFramebufferStatus && pglDeleteFramebuffers;
 }
-#elif defined(HAVE_OPENGLES)
+#elif defined(HAVE_OPENGLES11)
 #define pglGenFramebuffers glGenFramebuffersOES
 #define pglBindFramebuffer glBindFramebufferOES
 #define pglFramebufferTexture2D glFramebufferTexture2DOES
diff --git a/gfx/gles.c b/gfx/gles.c
index 935f412927..69e3527f9a 100644
--- a/gfx/gles.c
+++ b/gfx/gles.c
@@ -13,6 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/* Non-FF OpenGL 3 / OpenGL ES 2.0 driver */
+
 #include "../driver.h"
 
 #include <stdint.h>