From 5d2205fafb5d244af658de5e3c38c6cc805ae345 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 8 Aug 2017 11:52:42 -0400 Subject: include: Sync Khronos headers for OpenGL 4.6 Taken from c21e602b9fda1d3bbaecb08194592f67e6a0649b from OpenGL-Registry. (This time without breaking glext.h.) Signed-off-by: Adam Jackson Acked-by: Ilia Mirkin --- src/mapi/glapi/registry/gl.xml | 261 +++++++++++++++++++++++++++++++++-------- 1 file changed, 214 insertions(+), 47 deletions(-) (limited to 'src') diff --git a/src/mapi/glapi/registry/gl.xml b/src/mapi/glapi/registry/gl.xml index 353d0ef26ba..cbabe11b398 100644 --- a/src/mapi/glapi/registry/gl.xml +++ b/src/mapi/glapi/registry/gl.xml @@ -83,6 +83,7 @@ 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; @@ -2181,7 +2182,8 @@ typedef unsigned int GLhandleARB; - + + @@ -3648,8 +3650,10 @@ typedef unsigned int GLhandleARB; - - + + + + @@ -4285,18 +4289,30 @@ typedef unsigned int GLhandleARB; ARB_direct_state_access in February 2015 after determining it was not well defined or implementable. --> - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -4784,8 +4800,10 @@ typedef unsigned int GLhandleARB; - - + + + + @@ -6090,16 +6108,20 @@ typedef unsigned int GLhandleARB; + + + + @@ -7267,7 +7289,8 @@ typedef unsigned int GLhandleARB; - + + @@ -7439,12 +7462,16 @@ typedef unsigned int GLhandleARB; + + + + @@ -8668,9 +8695,13 @@ typedef unsigned int GLhandleARB; - - - + + + + + + + @@ -9860,6 +9891,14 @@ typedef unsigned int GLhandleARB; GLbitfield flags + + void glBufferStorageExternalEXT + GLenum target + GLintptr offset + GLsizeiptr size + GLeglClientBufferEXT clientBuffer + GLbitfield flags + void glBufferStorageMemEXT GLenum target @@ -11048,7 +11087,6 @@ typedef unsigned int GLhandleARB; GLint border GLsizei imageSize const void *data - void glCompressedTexSubImage1D @@ -11147,7 +11185,6 @@ typedef unsigned int GLhandleARB; GLenum format GLsizei imageSize const void *data - void glCompressedTextureImage1DEXT @@ -11769,7 +11806,6 @@ typedef unsigned int GLhandleARB; GLint y GLsizei width GLsizei height - void glCopyTextureImage1DEXT @@ -14067,7 +14103,6 @@ typedef unsigned int GLhandleARB; GLuint texture GLint level GLint zoffset - void glFramebufferTextureARB @@ -16679,7 +16714,7 @@ typedef unsigned int GLhandleARB; GLenum shadertype GLenum precisiontype GLint *range - GLint *precision + GLint *precision void glGetShaderSource @@ -19444,13 +19479,22 @@ 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 - GLintptr indirect + const void *indirect GLintptr drawcount GLsizei maxdrawcount GLsizei stride + void glMultiDrawArraysIndirectEXT @@ -19494,16 +19538,6 @@ 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 @@ -19549,14 +19583,24 @@ 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 - GLintptr indirect + const void *indirect GLintptr drawcount GLsizei maxdrawcount GLsizei stride + void glMultiDrawElementsIndirectEXT @@ -20609,6 +20653,14 @@ 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 @@ -21727,12 +21779,19 @@ typedef unsigned int GLhandleARB; - void glPolygonOffsetClampEXT + void glPolygonOffsetClamp GLfloat factor GLfloat units GLfloat clamp + + void glPolygonOffsetClampEXT + GLfloat factor + GLfloat units + GLfloat clamp + + void glPolygonOffsetEXT GLfloat factor @@ -24684,6 +24743,14 @@ 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 @@ -24691,6 +24758,7 @@ typedef unsigned int GLhandleARB; GLuint numSpecializationConstants const GLuint *pConstantIndex const GLuint *pConstantValue + void glSpriteParameterfSGIX @@ -25807,7 +25875,6 @@ typedef unsigned int GLhandleARB; GLenum format GLenum type const void *pixels - void glTexImage4DSGIS @@ -26189,7 +26256,6 @@ typedef unsigned int GLhandleARB; GLenum format GLenum type const void *pixels - void glTexSubImage4DSGIS @@ -34777,6 +34843,60 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -38587,6 +38707,13 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -39164,6 +39291,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -39704,11 +39837,10 @@ typedef unsigned int GLhandleARB; - + - - - + + @@ -39919,6 +40051,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -41841,6 +41979,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -42968,6 +43112,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -42982,7 +43134,7 @@ typedef unsigned int GLhandleARB; - + @@ -44375,6 +44527,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -45344,6 +45502,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -45639,6 +45805,7 @@ typedef unsigned int GLhandleARB; + @@ -46353,7 +46520,7 @@ typedef unsigned int GLhandleARB; - + -- cgit v1.2.3