From 7fd08177a631a6d4223d79d71a299d61870f9485 Mon Sep 17 00:00:00 2001 From: Nicolai Hähnle Date: Sat, 10 Jun 2017 20:46:27 +0200 Subject: Update Khronos-supplied headers Taken from commit 676834dd529d620ee25090e738d2607dfde003d8 of https://github.com/KhronosGroup/OpenGL-Registry.git v2: - keep the BUILDING_MESA bits (Matt) Reviewed-by: Matt Turner Reviewed-by: Emil Velikov --- src/mapi/glapi/registry/gl.xml | 2160 +++++++++++++++++++++++++++++----------- 1 file changed, 1573 insertions(+), 587 deletions(-) (limited to 'src/mapi') diff --git a/src/mapi/glapi/registry/gl.xml b/src/mapi/glapi/registry/gl.xml index 9e2ff983a20..353d0ef26ba 100644 --- a/src/mapi/glapi/registry/gl.xml +++ b/src/mapi/glapi/registry/gl.xml @@ -1,36 +1,27 @@ -Copyright (c) 2013-2016 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Materials. - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +Copyright (c) 2013-2017 The Khronos Group Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. ------------------------------------------------------------------------ -This file, gl.xml, is the OpenGL and OpenGL API Registry. The older -".spec" file format has been retired and will no longer be updated with -new extensions and API versions. The canonical version of the registry, -together with documentation, schema, and Python generator scripts used -to generate C header files for OpenGL and OpenGL ES, can always be found -in the Khronos Registry at - http://www.opengl.org/registry/ +This file, gl.xml, is the OpenGL and OpenGL API Registry. The canonical +version of the registry, together with documentation, schema, and Python +generator scripts used to generate C header files for OpenGL and OpenGL ES, +can always be found in the Khronos Registry at + https://github.com/KhronosGroup/OpenGL-Registry @@ -151,6 +142,7 @@ typedef unsigned int GLhandleARB; typedef void ( *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam); typedef unsigned short GLhalfNV; typedef GLintptr GLvdpauSurfaceNV; + typedef void ( *GLVULKANPROCNV)(void); @@ -250,6 +242,41 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -401,6 +428,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -526,6 +559,17 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + @@ -591,6 +635,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -737,11 +785,15 @@ typedef unsigned int GLhandleARB; + + + + @@ -881,6 +933,7 @@ typedef unsigned int GLhandleARB; + @@ -1415,6 +1468,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -1795,6 +1853,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -1805,6 +1867,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -1830,6 +1898,7 @@ typedef unsigned int GLhandleARB; + @@ -1888,6 +1957,16 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + @@ -1954,31 +2033,67 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + @@ -2097,7 +2212,8 @@ typedef unsigned int GLhandleARB; - + + @@ -2294,11 +2410,17 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -2412,11 +2534,14 @@ typedef unsigned int GLhandleARB; + + + @@ -7442,7 +7567,9 @@ typedef unsigned int GLhandleARB; - + + + @@ -8030,7 +8157,9 @@ typedef unsigned int GLhandleARB; - + + + @@ -8042,7 +8171,17 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + @@ -8174,14 +8313,16 @@ typedef unsigned int GLhandleARB; - + + + - + @@ -8339,7 +8480,9 @@ typedef unsigned int GLhandleARB; - + + + @@ -8517,18 +8660,56 @@ typedef unsigned int GLhandleARB; - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + @@ -8549,7 +8730,9 @@ typedef unsigned int GLhandleARB; - + + + @@ -30403,7 +30831,6 @@ typedef unsigned int GLhandleARB; - @@ -30431,21 +30858,9 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - @@ -30456,7 +30871,6 @@ typedef unsigned int GLhandleARB; - @@ -30508,23 +30922,7 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - - - - - @@ -30543,9 +30941,6 @@ typedef unsigned int GLhandleARB; - - - @@ -30585,14 +30980,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - @@ -30638,11 +31025,9 @@ typedef unsigned int GLhandleARB; - - @@ -30692,7 +31077,6 @@ typedef unsigned int GLhandleARB; - @@ -30728,35 +31112,8 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -30803,6 +31160,403 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30836,20 +31590,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - - - @@ -33126,6 +33866,7 @@ typedef unsigned int GLhandleARB; + @@ -36507,7 +37248,37 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36619,7 +37390,7 @@ typedef unsigned int GLhandleARB; - + @@ -36670,6 +37441,7 @@ typedef unsigned int GLhandleARB; + @@ -36697,6 +37469,7 @@ typedef unsigned int GLhandleARB; + @@ -36921,7 +37694,7 @@ typedef unsigned int GLhandleARB; - + @@ -37090,7 +37863,7 @@ typedef unsigned int GLhandleARB; - + @@ -37516,7 +38289,7 @@ typedef unsigned int GLhandleARB; - + @@ -37649,7 +38422,7 @@ typedef unsigned int GLhandleARB; - + @@ -37769,7 +38542,7 @@ typedef unsigned int GLhandleARB; - + @@ -37859,7 +38632,7 @@ typedef unsigned int GLhandleARB; - + @@ -38042,7 +38815,7 @@ typedef unsigned int GLhandleARB; - + @@ -38345,7 +39118,7 @@ typedef unsigned int GLhandleARB; - + @@ -38367,7 +39140,7 @@ typedef unsigned int GLhandleARB; - + @@ -38391,7 +39164,7 @@ typedef unsigned int GLhandleARB; - + @@ -38505,7 +39278,7 @@ typedef unsigned int GLhandleARB; - + @@ -38575,6 +39348,7 @@ typedef unsigned int GLhandleARB; + @@ -38629,7 +39403,7 @@ typedef unsigned int GLhandleARB; - + @@ -38666,7 +39440,7 @@ typedef unsigned int GLhandleARB; - + @@ -38866,7 +39640,7 @@ typedef unsigned int GLhandleARB; - + @@ -38928,8 +39702,15 @@ typedef unsigned int GLhandleARB; - - + + + + + + + + + @@ -39009,12 +39790,12 @@ typedef unsigned int GLhandleARB; - + - + @@ -39138,7 +39919,7 @@ typedef unsigned int GLhandleARB; - + @@ -39180,7 +39961,7 @@ typedef unsigned int GLhandleARB; - + @@ -39214,7 +39995,7 @@ typedef unsigned int GLhandleARB; - + @@ -40255,6 +41036,8 @@ typedef unsigned int GLhandleARB; + + @@ -40368,6 +41151,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -40421,6 +41210,7 @@ typedef unsigned int GLhandleARB; + @@ -40521,7 +41311,7 @@ typedef unsigned int GLhandleARB; - + @@ -40537,7 +41327,7 @@ typedef unsigned int GLhandleARB; - + @@ -40551,7 +41341,7 @@ typedef unsigned int GLhandleARB; - + @@ -41032,7 +41822,7 @@ typedef unsigned int GLhandleARB; - + @@ -41045,6 +41835,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -41372,6 +42168,67 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41537,13 +42394,13 @@ typedef unsigned int GLhandleARB; - + - + @@ -41575,7 +42432,7 @@ typedef unsigned int GLhandleARB; - + @@ -41626,6 +42483,49 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41667,7 +42567,7 @@ typedef unsigned int GLhandleARB; - + @@ -41806,7 +42706,7 @@ typedef unsigned int GLhandleARB; - + @@ -41863,7 +42763,7 @@ typedef unsigned int GLhandleARB; - + @@ -42063,6 +42963,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -42085,7 +42990,7 @@ typedef unsigned int GLhandleARB; - + @@ -42160,7 +43065,7 @@ typedef unsigned int GLhandleARB; - + @@ -42319,7 +43224,7 @@ typedef unsigned int GLhandleARB; - + @@ -42714,7 +43619,13 @@ typedef unsigned int GLhandleARB; - + + + + + + + @@ -42848,6 +43759,16 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + @@ -42951,13 +43872,13 @@ typedef unsigned int GLhandleARB; - + - + @@ -42986,7 +43907,7 @@ typedef unsigned int GLhandleARB; - + @@ -43020,7 +43941,7 @@ typedef unsigned int GLhandleARB; - + @@ -43040,7 +43961,7 @@ typedef unsigned int GLhandleARB; - + @@ -43293,6 +44214,7 @@ typedef unsigned int GLhandleARB; + @@ -43328,6 +44250,7 @@ typedef unsigned int GLhandleARB; + @@ -43343,19 +44266,37 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + + + + + + - + - + @@ -43372,7 +44313,7 @@ typedef unsigned int GLhandleARB; - + @@ -43429,13 +44370,13 @@ typedef unsigned int GLhandleARB; - + - + @@ -43443,7 +44384,7 @@ typedef unsigned int GLhandleARB; - + @@ -43489,7 +44430,7 @@ typedef unsigned int GLhandleARB; - + @@ -43499,7 +44440,7 @@ typedef unsigned int GLhandleARB; - + @@ -43508,7 +44449,7 @@ typedef unsigned int GLhandleARB; - + @@ -43516,7 +44457,7 @@ typedef unsigned int GLhandleARB; - + @@ -43634,6 +44575,15 @@ typedef unsigned int GLhandleARB; + + + + + + + + + @@ -43724,7 +44674,7 @@ typedef unsigned int GLhandleARB; - + @@ -43756,7 +44706,7 @@ typedef unsigned int GLhandleARB; - + @@ -43792,7 +44742,7 @@ typedef unsigned int GLhandleARB; - + @@ -43802,7 +44752,7 @@ typedef unsigned int GLhandleARB; - + @@ -43832,7 +44782,7 @@ typedef unsigned int GLhandleARB; - + @@ -43867,7 +44817,7 @@ typedef unsigned int GLhandleARB; - + @@ -43911,7 +44861,7 @@ typedef unsigned int GLhandleARB; - + @@ -44037,7 +44987,7 @@ typedef unsigned int GLhandleARB; - + @@ -44055,6 +45005,27 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + @@ -44116,7 +45087,7 @@ typedef unsigned int GLhandleARB; - + @@ -44356,7 +45327,7 @@ typedef unsigned int GLhandleARB; - + @@ -44526,7 +45497,7 @@ typedef unsigned int GLhandleARB; - + @@ -44541,13 +45512,13 @@ typedef unsigned int GLhandleARB; - - - - - - - + + + + + + + @@ -44568,7 +45539,7 @@ typedef unsigned int GLhandleARB; - + @@ -44577,14 +45548,14 @@ typedef unsigned int GLhandleARB; - + - + @@ -44595,7 +45566,7 @@ typedef unsigned int GLhandleARB; - + @@ -44618,7 +45589,7 @@ typedef unsigned int GLhandleARB; - + @@ -44835,7 +45806,7 @@ typedef unsigned int GLhandleARB; - + @@ -44876,7 +45847,7 @@ typedef unsigned int GLhandleARB; - + @@ -44901,7 +45872,7 @@ typedef unsigned int GLhandleARB; - + @@ -45203,8 +46174,8 @@ typedef unsigned int GLhandleARB; - - + + @@ -46096,15 +47067,16 @@ typedef unsigned int GLhandleARB; - + + - + @@ -46216,11 +47188,25 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + -- cgit v1.2.3