ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(PS3) Add raw PSGL ifdefs

This commit is contained in:
twinaphex 2014-05-27 22:15:25 +02:00
parent 0ea15de950
commit c5f43963c0
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.ps3
View File

@ -12,7 +12,7 @@ RMENU_IMG_DIR := media/rmenu
DOWNLOAD_SHADERS = 1 DOWNLOAD_SHADERS = 1
STRIPPING_ENABLE = 0 STRIPPING_ENABLE = 0
DEBUG = 0 DEBUG = 0
HAVE_GCMGL = 1 HAVE_GCMGL = 0
HAVE_LOGGER = 0 HAVE_LOGGER = 0
HAVE_FREETYPE = 0 HAVE_FREETYPE = 0
HAVE_RLAUNCH = 0 HAVE_RLAUNCH = 0

2
gfx/gl.c
View File

@ -744,7 +744,7 @@ static bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height)
if (stencil) if (stencil)
{ {
#if defined(HAVE_OPENGLES2) || defined(OSX_PPC) #if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES1) || defined(OSX_PPC)
// GLES2 is a bit weird, as always. :P // GLES2 is a bit weird, as always. :P
// There's no GL_DEPTH_STENCIL_ATTACHMENT like in desktop GL. // There's no GL_DEPTH_STENCIL_ATTACHMENT like in desktop GL.
glFramebufferRenderbuffer(RARCH_GL_FRAMEBUFFER, RARCH_GL_DEPTH_ATTACHMENT, glFramebufferRenderbuffer(RARCH_GL_FRAMEBUFFER, RARCH_GL_DEPTH_ATTACHMENT,

11
gfx/gl_common.h
View File

@ -86,6 +86,11 @@
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT #define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_EXT #define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_EXT
#elif defined(HAVE_PSGL) && !defined(HAVE_GCMGL)
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_OES
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_SCE
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_OES
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_OES
#else #else
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER #define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8 #define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8
@ -95,10 +100,16 @@
#ifdef OSX_PPC #ifdef OSX_PPC
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_EXT #define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_EXT
#elif defined(HAVE_PSGL) && !defined(HAVE_GCMGL)
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_OES
#else #else
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE #define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE
#endif #endif
#if defined(HAVE_PSGL) && !defined(HAVE_GCMGL)
#define glGenerateMipmap glGenerateMipmapOES
#endif
static inline bool gl_check_error(void) static inline bool gl_check_error(void)
{ {
int error = glGetError(); int error = glGetError();