libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(PS3) Needs ifndef around querying of BGRA888 - PSGL only has GL_BGRA

Browse Source 
defined and not GL_BGRA888_EXT
This commit is contained in:
twinaphex 2012-09-30 04:47:35 +02:00
parent fb78009e10
commit e4399884d9
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.ps3
View File

@ -10,7 +10,6 @@ DEBUG = 0
DOWNLOAD_SHADERS = 1 DOWNLOAD_SHADERS = 1
STRIPPING_ENABLE = 0 STRIPPING_ENABLE = 0
HAVE_RGL = 1 HAVE_RGL = 1
HAVE_RGL_NEW = 1
HAVE_LOGGER = 0 HAVE_LOGGER = 0
HAVE_FREETYPE = 0 HAVE_FREETYPE = 0
@ -67,10 +66,6 @@ else
GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc
endif endif
ifeq ($(HAVE_RGL_NEW), 1)
GL_LIBS += -lcgc_ps3
endif
ifeq ($(HAVE_FREETYPE), 1) ifeq ($(HAVE_FREETYPE), 1)
DEFINES += -DHAVE_FREETYPE DEFINES += -DHAVE_FREETYPE
FONT_LIBS := -lfontFT_stub -lfreetype_stub FONT_LIBS := -lfontFT_stub -lfreetype_stub

2
gfx/gl.c
View File

@ -1227,7 +1227,7 @@ static bool resolve_extensions(gl_t *gl)
gl->border_type = GL_CLAMP_TO_BORDER; gl->border_type = GL_CLAMP_TO_BORDER;
#endif #endif
#ifdef HAVE_OPENGLES #if defined(HAVE_OPENGLES) && (!defined(HAVE_PSGL) || !defined(HAVE_RGL))
if (!gl_query_extension("BGRA8888")) if (!gl_query_extension("BGRA8888"))
{ {
RARCH_ERR("[GL]: GLES implementation does not have BGRA8888 extension.\n"); RARCH_ERR("[GL]: GLES implementation does not have BGRA8888 extension.\n");