Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af8df171 authored by Ian Elliott's avatar Ian Elliott
Browse files

Fix compatibility problems with newer GLES Khronos headers. 

Two sets of problems:

- GLchar was missing from "gl.h".
- GLbyte, GLshort, and GLclampf was in both "gl.h" and "glext.h".

This was fine for building Android, but not for other components that
use more of the Khronos functionality.

Test: Compile Android and other code that needs GLchar, GLbyte, GLshort, and GLclampf.
Change-Id: I47ce0c2a5e985a1088cd8e75a94b3573e4aa7f8e
parent 47c479d9

opengl/include/GLES/gl.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

opengl/include/GLES/glext.h

+0 −3
Original line number Diff line number Diff line
@@ -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);