From f0702ac72cc31691f01170ddeb018fd53bc6430c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 5 Sep 2016 07:59:26 +0200
Subject: [PATCH] (PS3) Buildfix

---
 gfx/drivers/gl.c              | 15 ++++++++-------
 gfx/drivers/gl_capabilities.c | 13 -------------
 gfx/drivers/gl_capabilities.h | 17 +++++++++++++++--
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index ff2468e3da..37273bc3d0 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -87,6 +87,14 @@
 #define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
 #endif
 
+#ifdef IOS
+/* There is no default frame buffer on iOS. */
+void cocoagl_bind_game_view_fbo(void);
+#define gl_bind_backbuffer() cocoagl_bind_game_view_fbo()
+#else
+#define gl_bind_backbuffer() glBindFramebuffer(RARCH_GL_FRAMEBUFFER, 0)
+#endif
+
 /* Used for the last pass when rendering to the back buffer. */
 static const GLfloat vertexes_flipped[] = {
    0, 1,
@@ -457,13 +465,6 @@ static void gl_disable_client_arrays(void)
 }
 #endif
 
-#ifdef IOS
-/* There is no default frame buffer on iOS. */
-void cocoagl_bind_game_view_fbo(void);
-#define gl_bind_backbuffer() cocoagl_bind_game_view_fbo()
-#else
-#define gl_bind_backbuffer() glBindFramebuffer(RARCH_GL_FRAMEBUFFER, 0)
-#endif
 
 GLenum min_filter_to_mag(GLenum type)
 {
diff --git a/gfx/drivers/gl_capabilities.c b/gfx/drivers/gl_capabilities.c
index 69c63506a2..ff38a2731c 100644
--- a/gfx/drivers/gl_capabilities.c
+++ b/gfx/drivers/gl_capabilities.c
@@ -26,19 +26,6 @@
 #include "../video_driver.h"
 #include "../../verbosity.h"
 
-#if defined(HAVE_FBO) && defined(HAVE_PSGL)
-#define glGenFramebuffers glGenFramebuffersOES
-#define glBindFramebuffer glBindFramebufferOES
-#define glFramebufferTexture2D glFramebufferTexture2DOES
-#define glCheckFramebufferStatus glCheckFramebufferStatusOES
-#define glDeleteFramebuffers glDeleteFramebuffersOES
-#define glGenRenderbuffers glGenRenderbuffersOES
-#define glBindRenderbuffer glBindRenderbufferOES
-#define glFramebufferRenderbuffer glFramebufferRenderbufferOES
-#define glRenderbufferStorage glRenderbufferStorageOES
-#define glDeleteRenderbuffers glDeleteRenderbuffersOES
-#endif
-
 static bool gl_core_context       = false;
 
 bool gl_query_core_context_in_use(void)
diff --git a/gfx/drivers/gl_capabilities.h b/gfx/drivers/gl_capabilities.h
index 41ea5b57a7..2f8dd3b244 100644
--- a/gfx/drivers/gl_capabilities.h
+++ b/gfx/drivers/gl_capabilities.h
@@ -15,14 +15,27 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GL_CAPABILITIES_H
-#define GL_CAPABILITIES_H
+#ifndef _GL_CAPABILITIES_H
+#define _GL_CAPABILITIES_H
 
 #include <boolean.h>
 #include <retro_common_api.h>
 
 #include <glsym/glsym.h>
 
+#if defined(HAVE_FBO) && defined(HAVE_PSGL)
+#define glGenFramebuffers glGenFramebuffersOES
+#define glBindFramebuffer glBindFramebufferOES
+#define glFramebufferTexture2D glFramebufferTexture2DOES
+#define glCheckFramebufferStatus glCheckFramebufferStatusOES
+#define glDeleteFramebuffers glDeleteFramebuffersOES
+#define glGenRenderbuffers glGenRenderbuffersOES
+#define glBindRenderbuffer glBindRenderbufferOES
+#define glFramebufferRenderbuffer glFramebufferRenderbufferOES
+#define glRenderbufferStorage glRenderbufferStorageOES
+#define glDeleteRenderbuffers glDeleteRenderbuffersOES
+#endif
+
 #if (!defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES3))
 #ifdef GL_PIXEL_PACK_BUFFER
 #define HAVE_GL_ASYNC_READBACK