gl-dispatch.diff

diff --unified -r before/mapi/es1api/glapi_mapi_tmp.h after/mapi/es1api/glapi_mapi_tmp.h
--- before/mapi/es1api/glapi_mapi_tmp.h	2018-12-14 13:02:49.133735378 +0000
+++ after/mapi/es1api/glapi_mapi_tmp.h	2018-12-14 13:02:49.160402046 +0000
@@ -100,7 +100,6 @@
 GLAPI void APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
 GLAPI void APIENTRY glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
 GLAPI void APIENTRY glSampleCoverage(GLfloat target, GLboolean invert);
-GLAPI void APIENTRY glMultiDrawArraysEXT(GLenum mode, const GLint *first, const GLsizei *n, GLsizei instancecount);
 GLAPI void APIENTRY glPointParameterf(GLenum pname, GLfloat data);
 GLAPI void APIENTRY glPointParameterfv(GLenum pname, const GLfloat *data);
 GLAPI void APIENTRY glBindBuffer(GLenum target, GLuint buffer);
@@ -113,7 +112,6 @@
 GLAPI void APIENTRY glClearDepthf(GLfloat d);
 GLAPI void APIENTRY glDepthRangef(GLfloat n, GLfloat f);
 GLAPI void APIENTRY glPointSizePointerOES(GLenum type, GLsizei stride, const void *pointer);
-GLAPI void APIENTRY glMultiDrawElementsEXT(GLenum mode, const GLsizei *n, GLenum type, const void *const *indices, GLsizei instancecount);
 GLAPI void APIENTRY glAlphaFuncx(GLenum func, GLfixed ref);
 GLAPI void APIENTRY glClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
 GLAPI void APIENTRY glClearDepthx(GLfixed d);
@@ -791,13 +789,6 @@
    ((void (APIENTRY *)(GLfloat target, GLboolean invert)) _func)(target, invert);
 }
 
-GLAPI void APIENTRY glMultiDrawArraysEXT(GLenum mode, const GLint *first, const GLsizei *n, GLsizei instancecount)
-{
-   const struct _glapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[424];
-   ((void (APIENTRY *)(GLenum mode, const GLint *first, const GLsizei *n, GLsizei instancecount)) _func)(mode, first, n, instancecount);
-}
-
 GLAPI void APIENTRY glPointParameterf(GLenum pname, GLfloat data)
 {
    const struct _glapi_table *_tbl = entry_current_get();
@@ -882,13 +873,6 @@
    ((void (APIENTRY *)(GLenum type, GLsizei stride, const void *pointer)) _func)(type, stride, pointer);
 }
 
-GLAPI void APIENTRY glMultiDrawElementsEXT(GLenum mode, const GLsizei *n, GLenum type, const void *const *indices, GLsizei instancecount)
-{
-   const struct _glapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1172];
-   ((void (APIENTRY *)(GLenum mode, const GLsizei *n, GLenum type, const void *const *indices, GLsizei instancecount)) _func)(mode, n, type, indices, instancecount);
-}
-
 GLAPI void APIENTRY glAlphaFuncx(GLenum func, GLfixed ref)
 {
    const struct _glapi_table *_tbl = entry_current_get();
@@ -1190,7 +1174,10 @@
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLfixed *data)) _func)(target, pname, data);
 }
 
-/* does not need public_entries */
+
+#endif /* MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN */
+
+#ifdef MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN
 #undef MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN
 #endif /* MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN */
 
@@ -1466,9 +1453,6 @@
 STUB_ASM_ENTRY("glSampleCoverage")"\n"
 "\t"STUB_ASM_CODE("419")"\n"
 
-STUB_ASM_ENTRY("glMultiDrawArraysEXT")"\n"
-"\t"STUB_ASM_CODE("424")"\n"
-
 STUB_ASM_ENTRY("glPointParameterf")"\n"
 "\t"STUB_ASM_CODE("425")"\n"
 
@@ -1505,9 +1489,6 @@
 STUB_ASM_ENTRY("glPointSizePointerOES")"\n"
 "\t"STUB_ASM_CODE("1087")"\n"
 
-STUB_ASM_ENTRY("glMultiDrawElementsEXT")"\n"
-"\t"STUB_ASM_CODE("1172")"\n"
-
 STUB_ASM_ENTRY("glAlphaFuncx")"\n"
 "\t"STUB_ASM_CODE("1374")"\n"
 
@@ -1640,3 +1621,4 @@
 );
 #undef MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN
 #endif /* MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN */
+
diff --unified -r before/mapi/es2api/glapi_mapi_tmp.h after/mapi/es2api/glapi_mapi_tmp.h
--- before/mapi/es2api/glapi_mapi_tmp.h	2018-12-14 13:02:49.153735379 +0000
+++ after/mapi/es2api/glapi_mapi_tmp.h	2018-12-14 13:02:49.180402046 +0000
@@ -72,7 +72,6 @@
 GLAPI void APIENTRY glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei d, GLenum format, GLsizei imageSize, const void *data);
 GLAPI void APIENTRY glSampleCoverage(GLfloat target, GLboolean invert);
 GLAPI void APIENTRY glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-GLAPI void APIENTRY glMultiDrawArraysEXT(GLenum mode, const GLint *first, const GLsizei *n, GLsizei instancecount);
 GLAPI void APIENTRY glBeginQuery(GLenum target, GLuint id);
 GLAPI void APIENTRY glBindBuffer(GLenum target, GLuint buffer);
 GLAPI void APIENTRY glBufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage);
@@ -154,7 +153,6 @@
 GLAPI void APIENTRY glBeginTransformFeedback(GLenum mode);
 GLAPI void APIENTRY glBindBufferBase(GLenum target, GLuint index, GLuint buffer);
 GLAPI void APIENTRY glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI void APIENTRY glBindFragDataLocationEXT(GLuint program, GLuint colorNumber, const GLchar *name);
 GLAPI void APIENTRY glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat d, GLint stencil);
 GLAPI void APIENTRY glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *target);
 GLAPI void APIENTRY glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *target);
@@ -168,18 +166,14 @@
 GLAPI void APIENTRY glGetIntegeri_v(GLenum target, GLuint index, GLint *data);
 GLAPI const GLubyte *APIENTRY glGetStringi(GLenum name, GLuint index);
 GLAPI void APIENTRY glGetTexParameterIiv(GLenum target, GLenum pname, GLint *data);
-GLAPI void APIENTRY glGetTexParameterIivEXT(GLenum target, GLenum pname, GLint *data);
 GLAPI void APIENTRY glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *data);
-GLAPI void APIENTRY glGetTexParameterIuivEXT(GLenum target, GLenum pname, GLuint *data);
 GLAPI void APIENTRY glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
 GLAPI void APIENTRY glGetUniformuiv(GLuint program, GLint location, GLuint *data);
 GLAPI void APIENTRY glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *data);
 GLAPI void APIENTRY glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *data);
 GLAPI GLboolean APIENTRY glIsEnabledi(GLenum target, GLuint index);
 GLAPI void APIENTRY glTexParameterIiv(GLenum target, GLenum pname, const GLint *data);
-GLAPI void APIENTRY glTexParameterIivEXT(GLenum target, GLenum pname, const GLint *data);
 GLAPI void APIENTRY glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *data);
-GLAPI void APIENTRY glTexParameterIuivEXT(GLenum target, GLenum pname, const GLuint *data);
 GLAPI void APIENTRY glTransformFeedbackVaryings(GLuint program, GLsizei n, const GLchar *const *varyings, GLenum bufferMode);
 GLAPI void APIENTRY glUniform1ui(GLint location, GLuint v0);
 GLAPI void APIENTRY glUniform1uiv(GLint location, GLsizei n, const GLuint *target);
@@ -368,7 +362,6 @@
 GLAPI void APIENTRY glObjectPtrLabel(const void *ptr, GLsizei length, const GLchar *label);
 GLAPI void APIENTRY glPopDebugGroup(void);
 GLAPI void APIENTRY glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message);
-GLAPI void APIENTRY glMultiDrawElementsEXT(GLenum mode, const GLsizei *n, GLenum type, const void *const *indices, GLsizei instancecount);
 GLAPI void APIENTRY glVertexAttribI4i(GLuint index, GLint v0, GLint v1, GLint v2, GLint v3);
 GLAPI void APIENTRY glVertexAttribI4iv(GLuint index, const GLint *v);
 GLAPI void APIENTRY glVertexAttribI4ui(GLuint index, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
@@ -813,13 +806,6 @@
    ((void (APIENTRY *)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)) _func)(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
-GLAPI void APIENTRY glMultiDrawArraysEXT(GLenum mode, const GLint *first, const GLsizei *n, GLsizei instancecount)
-{
-   const struct _glapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[424];
-   ((void (APIENTRY *)(GLenum mode, const GLint *first, const GLsizei *n, GLsizei instancecount)) _func)(mode, first, n, instancecount);
-}
-
 GLAPI void APIENTRY glBeginQuery(GLenum target, GLuint id)
 {
    const struct _glapi_table *_tbl = entry_current_get();
@@ -1387,13 +1373,6 @@
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) _func)(target, index, buffer, offset, size);
 }
 
-GLAPI void APIENTRY glBindFragDataLocationEXT(GLuint program, GLuint colorNumber, const GLchar *name)
-{
-   const struct _glapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[574];
-   ((void (APIENTRY *)(GLuint program, GLuint colorNumber, const GLchar *name)) _func)(program, colorNumber, name);
-}
-
 GLAPI void APIENTRY glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat d, GLint stencil)
 {
    const struct _glapi_table *_tbl = entry_current_get();
@@ -1485,13 +1464,6 @@
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *data)) _func)(target, pname, data);
 }
 
-GLAPI void APIENTRY glGetTexParameterIivEXT(GLenum target, GLenum pname, GLint *data)
-{
-   const struct _glapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[589];
-   ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *data)) _func)(target, pname, data);
-}
-
 GLAPI void APIENTRY glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *data)
 {
    const struct _glapi_table *_tbl = entry_current_get();
@@ -1499,13 +1471,6 @@
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLuint *data)) _func)(target, pname, data);
 }
 
-GLAPI void APIENTRY glGetTexParameterIuivEXT(GLenum target, GLenum pname, GLuint *data)
-{
-   const struct _glapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[590];
-   ((void (APIENTRY *)(GLenum target, GLenum pname, GLuint *data)) _func)(target, pname, data);
-}
-
 GLAPI void APIENTRY glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
    const struct _glapi_table *_tbl = entry_current_get();
@@ -1548,13 +1513,6 @@
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLint *data)) _func)(target, pname, data);
 }
 
-GLAPI void APIENTRY glTexParameterIivEXT(GLenum target, GLenum pname, const GLint *data)
-{
-   const struct _glapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[596];
-   ((void (APIENTRY *)(GLenum target, GLenum pname, const GLint *data)) _func)(target, pname, data);
-}
-
 GLAPI void APIENTRY glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *data)
 {
    const struct _glapi_table *_tbl = entry_current_get();
@@ -1562,13 +1520,6 @@
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLuint *data)) _func)(target, pname, data);
 }
 
-GLAPI void APIENTRY glTexParameterIuivEXT(GLenum target, GLenum pname, const GLuint *data)
-{
-   const struct _glapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[597];
-   ((void (APIENTRY *)(GLenum target, GLenum pname, const GLuint *data)) _func)(target, pname, data);
-}
-
 GLAPI void APIENTRY glTransformFeedbackVaryings(GLuint program, GLsizei n, const GLchar *const *varyings, GLenum bufferMode)
 {
    const struct _glapi_table *_tbl = entry_current_get();
@@ -2885,13 +2836,6 @@
    ((void (APIENTRY *)(GLenum source, GLuint id, GLsizei length, const GLchar *message)) _func)(source, id, length, message);
 }
 
-GLAPI void APIENTRY glMultiDrawElementsEXT(GLenum mode, const GLsizei *n, GLenum type, const void *const *indices, GLsizei instancecount)
-{
-   const struct _glapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1172];
-   ((void (APIENTRY *)(GLenum mode, const GLsizei *n, GLenum type, const void *const *indices, GLsizei instancecount)) _func)(mode, n, type, indices, instancecount);
-}
-
 GLAPI void APIENTRY glVertexAttribI4i(GLuint index, GLint v0, GLint v1, GLint v2, GLint v3)
 {
    const struct _glapi_table *_tbl = entry_current_get();
@@ -2934,7 +2878,10 @@
    ((void (APIENTRY *)(GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW)) _func)(minX, minY, minZ, minW, maxX, maxY, maxZ, maxW);
 }
 
-/* does not need public_entries */
+
+#endif /* MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN */
+
+#ifdef MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN
 #undef MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN
 #endif /* MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN */
 
@@ -3126,9 +3073,6 @@
 STUB_ASM_ENTRY("glBlendFuncSeparate")"\n"
 "\t"STUB_ASM_CODE("420")"\n"
 
-STUB_ASM_ENTRY("glMultiDrawArraysEXT")"\n"
-"\t"STUB_ASM_CODE("424")"\n"
-
 STUB_ASM_ENTRY("glBeginQuery")"\n"
 "\t"STUB_ASM_CODE("460")"\n"
 
@@ -3372,9 +3316,6 @@
 STUB_ASM_ENTRY("glBindBufferRange")"\n"
 "\t"STUB_ASM_CODE("573")"\n"
 
-STUB_ASM_ENTRY("glBindFragDataLocationEXT")"\n"
-"\t"STUB_ASM_CODE("574")"\n"
-
 STUB_ASM_ENTRY("glClearBufferfi")"\n"
 "\t"STUB_ASM_CODE("576")"\n"
 
@@ -3414,15 +3355,9 @@
 STUB_ASM_ENTRY("glGetTexParameterIiv")"\n"
 "\t"STUB_ASM_CODE("589")"\n"
 
-".globl ""glGetTexParameterIivEXT""\n"
-".set ""glGetTexParameterIivEXT"", ""glGetTexParameterIiv""\n"
-
 STUB_ASM_ENTRY("glGetTexParameterIuiv")"\n"
 "\t"STUB_ASM_CODE("590")"\n"
 
-".globl ""glGetTexParameterIuivEXT""\n"
-".set ""glGetTexParameterIuivEXT"", ""glGetTexParameterIuiv""\n"
-
 STUB_ASM_ENTRY("glGetTransformFeedbackVarying")"\n"
 "\t"STUB_ASM_CODE("591")"\n"
 
@@ -3441,15 +3376,9 @@
 STUB_ASM_ENTRY("glTexParameterIiv")"\n"
 "\t"STUB_ASM_CODE("596")"\n"
 
-".globl ""glTexParameterIivEXT""\n"
-".set ""glTexParameterIivEXT"", ""glTexParameterIiv""\n"
-
 STUB_ASM_ENTRY("glTexParameterIuiv")"\n"
 "\t"STUB_ASM_CODE("597")"\n"
 
-".globl ""glTexParameterIuivEXT""\n"
-".set ""glTexParameterIuivEXT"", ""glTexParameterIuiv""\n"
-
 STUB_ASM_ENTRY("glTransformFeedbackVaryings")"\n"
 "\t"STUB_ASM_CODE("598")"\n"
 
@@ -4014,9 +3943,6 @@
 STUB_ASM_ENTRY("glPushDebugGroup")"\n"
 "\t"STUB_ASM_CODE("1169")"\n"
 
-STUB_ASM_ENTRY("glMultiDrawElementsEXT")"\n"
-"\t"STUB_ASM_CODE("1172")"\n"
-
 STUB_ASM_ENTRY("glVertexAttribI4i")"\n"
 "\t"STUB_ASM_CODE("1288")"\n"
 
@@ -4038,3 +3964,4 @@
 );
 #undef MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN
 #endif /* MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN */
+