From e4399884d95fa1bd6d17f6b1f106cfe0b8eb3009 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 30 Sep 2012 04:47:35 +0200 Subject: [PATCH] (PS3) Needs ifndef around querying of BGRA888 - PSGL only has GL_BGRA defined and not GL_BGRA888_EXT --- Makefile.ps3 | 5 ----- gfx/gl.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile.ps3 b/Makefile.ps3 index 17076b1b22..f1ab774d7d 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -10,7 +10,6 @@ DEBUG = 0 DOWNLOAD_SHADERS = 1 STRIPPING_ENABLE = 0 HAVE_RGL = 1 -HAVE_RGL_NEW = 1 HAVE_LOGGER = 0 HAVE_FREETYPE = 0 @@ -67,10 +66,6 @@ else GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc endif -ifeq ($(HAVE_RGL_NEW), 1) -GL_LIBS += -lcgc_ps3 -endif - ifeq ($(HAVE_FREETYPE), 1) DEFINES += -DHAVE_FREETYPE FONT_LIBS := -lfontFT_stub -lfreetype_stub diff --git a/gfx/gl.c b/gfx/gl.c index bb4c8f96e9..9c89aaed4d 100644 --- a/gfx/gl.c +++ b/gfx/gl.c @@ -1227,7 +1227,7 @@ static bool resolve_extensions(gl_t *gl) gl->border_type = GL_CLAMP_TO_BORDER; #endif -#ifdef HAVE_OPENGLES +#if defined(HAVE_OPENGLES) && (!defined(HAVE_PSGL) || !defined(HAVE_RGL)) if (!gl_query_extension("BGRA8888")) { RARCH_ERR("[GL]: GLES implementation does not have BGRA8888 extension.\n");