[Mesa-dev] [PATCH] gles: Restore some lost typedefs

[Eric Engestrom]

On Friday, 2017-06-30 15:06:36 -0700, Ian Romanick wrote:
> Has this been reported to upstream (i.e., Khronos)?  I don't mind fixing
> these in our tree, but they really should get fixed at the source too.

I can't see any mention of this on neither the old Bugzilla (both
private and public) nor in the GitLab or the GitHub issues.

Scott, would you care to raise a bug? [1] if you have Khronos access,
or [2] otherwise.

Cheers,
  Eric

[1] https://gitlab.khronos.org/opengl/API/issues/new
[2] https://github.com/KhronosGroup/OpenGL-Registry/issues/new

> 
> On 06/30/2017 01:49 PM, Scott D Phillips wrote:
> > GLES/gl.h has historically provided some typedefs that are not
> > used in the API itself. Restore these typedefs that were lost to
> > avoid breaking applications.
> > 
> > These seem to be the only typedefs removed in the update.
> > 
> > Fixes: 7fd0817 "Update Khronos-supplied headers"
> > ---
> > 
> >  include/GLES/gl.h    | 6 +++++-
> >  include/GLES/glext.h | 3 ---
> >  2 files changed, 5 insertions(+), 4 deletions(-)
> > 
> > diff --git a/include/GLES/gl.h b/include/GLES/gl.h
> > index 056edb3..18f85e7 100644
> > --- a/include/GLES/gl.h
> > +++ b/include/GLES/gl.h
> > @@ -50,9 +50,13 @@ extern "C" {
> >  
> >  #ifndef GL_VERSION_ES_CM_1_0
> >  #define GL_VERSION_ES_CM_1_0 1
> > +#include <KHR/khrplatform.h>
> > +typedef khronos_int8_t GLbyte;
> > +typedef khronos_float_t GLclampf;
> > +typedef short GLshort;
> > +typedef unsigned short GLushort;
> >  typedef void GLvoid;
> >  typedef unsigned int GLenum;
> > -#include <KHR/khrplatform.h>
> >  typedef khronos_float_t GLfloat;
> >  typedef khronos_int32_t GLfixed;
> >  typedef unsigned int GLuint;
> > diff --git a/include/GLES/glext.h b/include/GLES/glext.h
> > index 1012a7e..6ea91a1 100644
> > --- a/include/GLES/glext.h
> > +++ b/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);
> > 
>