From 961c1189fdd7a2484ec99ddf1cdb6a965ccb067e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 27 May 2014 22:27:16 +0200 Subject: [PATCH] (PSGL) More PSGL ifdefs --- gfx/gl.c | 7 ++----- gfx/gl_common.h | 8 ++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gfx/gl.c b/gfx/gl.c index fddfa99de1..8504708ca7 100644 --- a/gfx/gl.c +++ b/gfx/gl.c @@ -196,9 +196,6 @@ static bool check_fbo_proc(gl_t *gl) #else #define check_fbo_proc(gl) (true) #endif -#if defined(__APPLE__) || defined(HAVE_PSGL) -#define GL_RGBA32F GL_RGBA32F_ARB -#endif #endif ////////////////// Shaders @@ -525,7 +522,7 @@ static void gl_create_fbo_textures(void *data) RARCH_ERR("[GL]: Floating-point FBO was requested, but is not supported. Falling back to UNORM.\n"); } -#ifndef HAVE_PSGL +#ifndef HAVE_OPENGLES if (srgb_fbo && gl->has_srgb_fbo) { RARCH_LOG("[GL]: FBO pass #%d is sRGB.\n", i); @@ -1835,7 +1832,7 @@ static bool resolve_extensions(gl_t *gl) #else #ifdef HAVE_FBO // Float FBO is core in 3.2. -#ifdef HAVE_PSGL +#ifdef HAVE_GCMGL gl->has_fp_fbo = false; // FIXME - rewrite GL implementation #else gl->has_fp_fbo = gl->core_context || gl_query_extension(gl, "ARB_texture_float"); diff --git a/gfx/gl_common.h b/gfx/gl_common.h index 3a8fb87977..b67dc8d5c1 100644 --- a/gfx/gl_common.h +++ b/gfx/gl_common.h @@ -110,6 +110,14 @@ #define glGenerateMipmap glGenerateMipmapOES #endif +#ifdef HAVE_FBO + +#if defined(__APPLE__) || defined(HAVE_PSGL) +#define GL_RGBA32F GL_RGBA32F_ARB +#endif + +#endif + static inline bool gl_check_error(void) { int error = glGetError();