diff options
| author | 2017-07-20 23:00:25 +0000 | |
|---|---|---|
| committer | 2017-07-20 23:00:25 +0000 | |
| commit | a2729f0faef9d7d0e4e8d421dd7dffac5e4b7dce (patch) | |
| tree | 083eef587da1e65ae6faf70768e57aad040fe9d5 | |
| parent | 1cb4f6859217128066016c886efab197deb12588 (diff) | |
| parent | 104fc9efc727fcffd7d7a8a9e29cff50d8caacb7 (diff) | |
Merge "Fix compatibility problems with newer GLES Khronos headers." am: 61fbde2446
am: 104fc9efc7
Change-Id: I58155d360ff861969fd43bc284ca5b8ead278544
| -rw-r--r-- | opengl/include/GLES/gl.h | 1 | ||||
| -rw-r--r-- | opengl/include/GLES/glext.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/opengl/include/GLES/gl.h b/opengl/include/GLES/gl.h index 36acff937f..25033f2a39 100644 --- a/opengl/include/GLES/gl.h +++ b/opengl/include/GLES/gl.h @@ -51,6 +51,7 @@ extern "C" { #ifndef GL_VERSION_ES_CM_1_0 #define GL_VERSION_ES_CM_1_0 1 typedef void GLvoid; +typedef char GLchar; typedef unsigned int GLenum; #include <KHR/khrplatform.h> typedef khronos_float_t GLfloat; diff --git a/opengl/include/GLES/glext.h b/opengl/include/GLES/glext.h index b6fe620827..1a150e34e8 100644 --- a/opengl/include/GLES/glext.h +++ b/opengl/include/GLES/glext.h @@ -104,7 +104,6 @@ GL_API void GL_APIENTRY glBlendEquationOES (GLenum mode); #ifndef GL_OES_byte_coordinates #define GL_OES_byte_coordinates 1 -typedef khronos_int8_t GLbyte; #endif /* GL_OES_byte_coordinates */ #ifndef GL_OES_compressed_ETC1_RGB8_sub_texture @@ -128,7 +127,6 @@ typedef khronos_int8_t GLbyte; #ifndef GL_OES_draw_texture #define GL_OES_draw_texture 1 -typedef short GLshort; #define GL_TEXTURE_CROP_RECT_OES 0x8B9D typedef void (GL_APIENTRYP PFNGLDRAWTEXSOESPROC) (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); typedef void (GL_APIENTRYP PFNGLDRAWTEXIOESPROC) (GLint x, GLint y, GLint z, GLint width, GLint height); @@ -409,7 +407,6 @@ GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES (GLfixed *mantissa, GLint *expon #ifndef GL_OES_single_precision #define GL_OES_single_precision 1 -typedef khronos_float_t GLclampf; typedef void (GL_APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth); typedef void (GL_APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation); typedef void (GL_APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f); |