From 9e454408335d7b4b465ea17590f06426dffe0211 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 24 Aug 2017 13:15:15 -0400 Subject: Revert "include: Sync Khronos headers for OpenGL 4.6" Broke the BUILDING_MESA bit, oops. This reverts commit ef1e87e6cdbd80e74a8bc6d48b0b174a0812fe69. --- src/mapi/glapi/registry/gl.xml | 261 ++++++++--------------------------------- 1 file changed, 47 insertions(+), 214 deletions(-) (limited to 'src/mapi') diff --git a/src/mapi/glapi/registry/gl.xml b/src/mapi/glapi/registry/gl.xml index cbabe11b398..353d0ef26ba 100644 --- a/src/mapi/glapi/registry/gl.xml +++ b/src/mapi/glapi/registry/gl.xml @@ -83,7 +83,6 @@ typedef unsigned __int64 uint64_t; typedef float GLclampf; typedef double GLdouble; typedef double GLclampd; - typedef void *GLeglClientBufferEXT; typedef void *GLeglImageOES; typedef char GLchar; typedef char GLcharARB; @@ -2182,8 +2181,7 @@ typedef unsigned int GLhandleARB; - - + @@ -3650,10 +3648,8 @@ typedef unsigned int GLhandleARB; - - - - + + @@ -4289,30 +4285,18 @@ typedef unsigned int GLhandleARB; ARB_direct_state_access in February 2015 after determining it was not well defined or implementable. --> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -4800,10 +4784,8 @@ typedef unsigned int GLhandleARB; - - - - + + @@ -6108,20 +6090,16 @@ typedef unsigned int GLhandleARB; - - - - @@ -7289,8 +7267,7 @@ typedef unsigned int GLhandleARB; - - + @@ -7462,16 +7439,12 @@ typedef unsigned int GLhandleARB; - - - - @@ -8695,13 +8668,9 @@ typedef unsigned int GLhandleARB; - - - - - - - + + + @@ -9891,14 +9860,6 @@ typedef unsigned int GLhandleARB; GLbitfield flags - - void glBufferStorageExternalEXT - GLenum target - GLintptr offset - GLsizeiptr size - GLeglClientBufferEXT clientBuffer - GLbitfield flags - void glBufferStorageMemEXT GLenum target @@ -11087,6 +11048,7 @@ typedef unsigned int GLhandleARB; GLint border GLsizei imageSize const void *data + void glCompressedTexSubImage1D @@ -11185,6 +11147,7 @@ typedef unsigned int GLhandleARB; GLenum format GLsizei imageSize const void *data + void glCompressedTextureImage1DEXT @@ -11806,6 +11769,7 @@ typedef unsigned int GLhandleARB; GLint y GLsizei width GLsizei height + void glCopyTextureImage1DEXT @@ -14103,6 +14067,7 @@ typedef unsigned int GLhandleARB; GLuint texture GLint level GLint zoffset + void glFramebufferTextureARB @@ -16714,7 +16679,7 @@ typedef unsigned int GLhandleARB; GLenum shadertype GLenum precisiontype GLint *range - GLint *precision + GLint *precision void glGetShaderSource @@ -19479,22 +19444,13 @@ typedef unsigned int GLhandleARB; GLsizei stride GLint vertexBufferCount - - void glMultiDrawArraysIndirectCount - GLenum mode - const void *indirect - GLintptr drawcount - GLsizei maxdrawcount - GLsizei stride - void glMultiDrawArraysIndirectCountARB GLenum mode - const void *indirect + GLintptr indirect GLintptr drawcount GLsizei maxdrawcount GLsizei stride - void glMultiDrawArraysIndirectEXT @@ -19538,6 +19494,16 @@ typedef unsigned int GLhandleARB; const GLint *basevertex + + void glMultiDrawElementsBaseVertexOES + GLenum mode + const GLsizei *count + GLenum type + const void *const*indices + GLsizei primcount + const GLint *basevertex + + void glMultiDrawElementsEXT GLenum mode @@ -19583,24 +19549,14 @@ typedef unsigned int GLhandleARB; GLsizei stride GLint vertexBufferCount - - void glMultiDrawElementsIndirectCount - GLenum mode - GLenum type - const void *indirect - GLintptr drawcount - GLsizei maxdrawcount - GLsizei stride - void glMultiDrawElementsIndirectCountARB GLenum mode GLenum type - const void *indirect + GLintptr indirect GLintptr drawcount GLsizei maxdrawcount GLsizei stride - void glMultiDrawElementsIndirectEXT @@ -20653,14 +20609,6 @@ typedef unsigned int GLhandleARB; const void *data GLbitfield flags - - void glNamedBufferStorageExternalEXT - GLuint buffer - GLintptr offset - GLsizeiptr size - GLeglClientBufferEXT clientBuffer - GLbitfield flags - void glNamedBufferStorageEXT GLuint buffer @@ -21778,19 +21726,12 @@ typedef unsigned int GLhandleARB; GLfloat units - - void glPolygonOffsetClamp - GLfloat factor - GLfloat units - GLfloat clamp - - void glPolygonOffsetClampEXT GLfloat factor GLfloat units GLfloat clamp - + void glPolygonOffsetEXT @@ -24743,14 +24684,6 @@ typedef unsigned int GLhandleARB; const GLuint *textures const GLenum *dstLayouts - - void glSpecializeShader - GLuint shader - const GLchar *pEntryPoint - GLuint numSpecializationConstants - const GLuint *pConstantIndex - const GLuint *pConstantValue - void glSpecializeShaderARB GLuint shader @@ -24758,7 +24691,6 @@ typedef unsigned int GLhandleARB; GLuint numSpecializationConstants const GLuint *pConstantIndex const GLuint *pConstantValue - void glSpriteParameterfSGIX @@ -25875,6 +25807,7 @@ typedef unsigned int GLhandleARB; GLenum format GLenum type const void *pixels + void glTexImage4DSGIS @@ -26256,6 +26189,7 @@ typedef unsigned int GLhandleARB; GLenum format GLenum type const void *pixels + void glTexSubImage4DSGIS @@ -34843,60 +34777,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -38707,13 +38587,6 @@ typedef unsigned int GLhandleARB; - - - - - - - @@ -39291,12 +39164,6 @@ typedef unsigned int GLhandleARB; - - - - - - @@ -39837,10 +39704,11 @@ typedef unsigned int GLhandleARB; - + - - + + + @@ -40051,12 +39919,6 @@ typedef unsigned int GLhandleARB; - - - - - - @@ -41979,12 +41841,6 @@ typedef unsigned int GLhandleARB; - - - - - - @@ -43112,14 +42968,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - @@ -43134,7 +42982,7 @@ typedef unsigned int GLhandleARB; - + @@ -44527,12 +44375,6 @@ typedef unsigned int GLhandleARB; - - - - - - @@ -45502,14 +45344,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - @@ -45805,7 +45639,6 @@ typedef unsigned int GLhandleARB; - @@ -46520,7 +46353,7 @@ typedef unsigned int GLhandleARB; - + -- cgit v1.2.3