CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-27 06:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3347 from loganmc10/master

Browse Source 
GLES3 compile fixes
This commit is contained in:
Twinaphex 2016-08-07 07:11:54 +02:00 committed by GitHub
commit ddff9e39df
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.common
View File

@ -749,9 +749,11 @@ endif
ifeq ($(HAVE_GLES), 1)
LIBS += $(GLES_LIBS)
DEFINES += $(GLES_CFLAGS) -DHAVE_OPENGLES -DHAVE_OPENGLES2
DEFINES += $(GLES_CFLAGS) -DHAVE_OPENGLES
ifeq ($(HAVE_GLES3), 1)
DEFINES += -DHAVE_OPENGLES3
else
DEFINES += -DHAVE_OPENGLES2
endif
OBJ += libretro-common/glsym/glsym_es2.o
else

4
gfx/common/gl_common.h
View File

@ -58,7 +58,11 @@
#if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1) || defined(HAVE_OPENGLES_3_2)
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
#if defined(HAVE_OPENGLES2)
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
#else
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8
#endif
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
#elif defined(OSX_PPC)

2
gfx/drivers_context/wayland_ctx.c
View File

@ -520,7 +520,9 @@ static void *gfx_ctx_wl_init(void *video_driver)
else
#endif
#endif
#ifdef HAVE_OPENGLES2
attrib_ptr = egl_attribs_gles;
#endif
#endif
break;
case GFX_CTX_OPENVG_API: