(PSGL) More PSGL ifdefs

This commit is contained in:
twinaphex 2014-05-27 22:27:16 +02:00
parent c5f43963c0
commit 961c1189fd
2 changed files with 10 additions and 5 deletions

View File

@ -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");

View File

@ -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();