mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 11:24:27 +01:00
Fix X11 includes by avoiding confict. Only compile this EGL code on Android / Blackberry.
This commit is contained in:
1 parent
271ecd0cae
commit
dd03687400
2 files changed
+1
-8
No files matched your search
@@ -6,9 +6,6 @@
|
||||
#elif defined(USING_GLES2)
|
||||
#include <GLES2/gl2.h>
|
||||
#include <GLES2/gl2ext.h>
|
||||
#if !defined(MAEMO) && !defined(MEEGO_EDITION_HARMATTAN)
|
||||
#include <EGL/egl.h> // X11 pollutes namespace
|
||||
#endif
|
||||
// At least Nokia platforms need the three below
|
||||
#include <KHR/khrplatform.h>
|
||||
typedef char GLchar;
|
||||
|
||||
+1
-5
@@ -17,6 +17,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(ANDROID) || defined(BLACKBERRY)
|
||||
#include <EGL/egl.h>
|
||||
// Additional extensions not included in GLES2/gl2ext.h from the NDK
|
||||
|
||||
typedef uint64_t EGLuint64NV;
|
||||
@@ -28,9 +29,6 @@ extern PFNEGLGETSYSTEMTIMENVPROC eglGetSystemTimeNV;
|
||||
typedef GLvoid* (GL_APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
|
||||
extern PFNGLMAPBUFFERPROC glMapBuffer;
|
||||
|
||||
#endif
|
||||
|
||||
#if !defined(IOS) && !defined(MEEGO_EDITION_HARMATTAN)
|
||||
typedef void (EGLAPIENTRYP PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
|
||||
extern PFNGLDRAWTEXTURENVPROC glDrawTextureNV;
|
||||
typedef void (EGLAPIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum
|
||||
@@ -43,9 +41,7 @@ typedef void (EGLAPIENTRYP PFNGLBLITFRAMEBUFFERNVPROC) (
|
||||
GLint dstX0, GLint dstY0, GLint dstX1, GLuint dstY1,
|
||||
GLint mask, GLenum filter);
|
||||
extern PFNGLBLITFRAMEBUFFERNVPROC glBlitFramebufferNV;
|
||||
#endif
|
||||
|
||||
#if defined(ANDROID) || defined(BLACKBERRY)
|
||||
extern PFNGLDISCARDFRAMEBUFFEREXTPROC glDiscardFramebufferEXT;
|
||||
extern PFNGLGENVERTEXARRAYSOESPROC glGenVertexArraysOES;
|
||||
extern PFNGLBINDVERTEXARRAYOESPROC glBindVertexArrayOES;
|
||||
|
||||
Reference in new issue
Block a user