From adaf698751eb64ba0e4a3ff59172789003c721ee Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 22 Feb 2015 05:26:57 +0100
Subject: [PATCH] (Libretro TestGL) Updates

---
 libretro-test-gl/Makefile        | 45 +++++++++++++++++++++++++-------
 libretro-test-gl/libretro-test.c | 30 +++++++++++++++------
 2 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/libretro-test-gl/Makefile b/libretro-test-gl/Makefile
index b5473e3531..b7bea38428 100644
--- a/libretro-test-gl/Makefile
+++ b/libretro-test-gl/Makefile
@@ -1,15 +1,34 @@
 
 ifeq ($(platform),)
-platform = unix
-ifeq ($(shell uname -a),)
-   platform = win
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   platform = osx
-else ifneq ($(findstring win,$(shell uname -a)),)
-   platform = win
+	platform = unix
+	ifeq ($(shell uname -a),)
+		platform = win
+	else ifneq ($(findstring MINGW,$(shell uname -a)),)
+		platform = win
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		platform = osx
+		arch = intel
+	ifeq ($(shell uname -p),powerpc)
+		arch = ppc
+	endif
+	else ifneq ($(findstring win,$(shell uname -a)),)
+		platform = win
+	endif
 endif
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+	EXE_EXT = .exe
+	system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+	system_platform = osx
+	arch = intel
+	ifeq ($(shell uname -p),powerpc)
+		arch = ppc
+	endif
+	else ifneq ($(findstring MINGW,$(shell uname -a)),)
+	system_platform = win
 endif
 
 TARGET_NAME = testgl
@@ -25,6 +44,14 @@ else ifeq ($(platform), osx)
    SHARED := -dynamiclib
    GL_LIB := -framework OpenGL
    CFLAGS += -DOSX
+	ifeq ($(arch),ppc)
+		CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DOSX_PPC
+	endif
+	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
+	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
+	ifeq ($(OSX_LT_MAVERICKS),"YES")
+		fpic += -mmacosx-version-min=10.5
+	endif
 else ifeq ($(platform), pi)
    TARGET := $(TARGET_NAME)_libretro.so
    fpic := -fPIC
diff --git a/libretro-test-gl/libretro-test.c b/libretro-test-gl/libretro-test.c
index e5e07a05cd..5bc29d8c18 100644
--- a/libretro-test-gl/libretro-test.c
+++ b/libretro-test-gl/libretro-test.c
@@ -10,6 +10,20 @@ static struct retro_hw_render_callback hw_render;
 
 #include "../libretro-common/include/glsym/glsym.h"
 
+#if defined(HAVE_PSGL)
+#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
+#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
+#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
+#elif defined(OSX_PPC)
+#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
+#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT
+#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
+#else
+#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER
+#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE
+#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0
+#endif
+
 #define BASE_WIDTH 320
 #define BASE_HEIGHT 240
 #ifdef GLES
@@ -143,15 +157,15 @@ static void init_multisample(unsigned samples)
       glBindRenderbuffer(GL_RENDERBUFFER, 0);
 
       glGenFramebuffers(1, &fbo);
-      glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+      glBindFramebuffer(RARCH_GL_FRAMEBUFFER, fbo);
 
-      glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+      glFramebufferRenderbuffer(RARCH_GL_FRAMEBUFFER, RARCH_GL_COLOR_ATTACHMENT0,
             GL_RENDERBUFFER, rbo_color);
-      glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
+      glFramebufferRenderbuffer(RARCH_GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
             GL_RENDERBUFFER, rbo_depth_stencil);
 
-      GLenum ret = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-      if (ret == GL_FRAMEBUFFER_COMPLETE)
+      GLenum ret = glCheckFramebufferStatus(RARCH_GL_FRAMEBUFFER);
+      if (ret == RARCH_GL_FRAMEBUFFER_COMPLETE)
       {
          fprintf(stderr, "Using multisampled FBO.\n");
          multisample_fbo = true;
@@ -159,7 +173,7 @@ static void init_multisample(unsigned samples)
       else
          fprintf(stderr, "Multisampled FBO failed.\n");
 
-      glBindFramebuffer(GL_FRAMEBUFFER, 0);
+      glBindFramebuffer(RARCH_GL_FRAMEBUFFER, 0);
    }
    else
       fprintf(stderr, "Multisampled FBOs not supported.\n");
@@ -337,10 +351,10 @@ void retro_run(void)
 #ifdef CORE
    glBindVertexArray(vao);
    if (multisample_fbo)
-      glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+      glBindFramebuffer(RARCH_GL_FRAMEBUFFER, fbo);
    else
 #endif
-      glBindFramebuffer(GL_FRAMEBUFFER, hw_render.get_current_framebuffer());
+      glBindFramebuffer(RARCH_GL_FRAMEBUFFER, hw_render.get_current_framebuffer());
 
    glClearColor(0.3, 0.4, 0.5, 1.0);
    glViewport(0, 0, width, height);