Add CTS_ARB_spirv_extensions test implementation
authorAdam Czupryna <adam.czupryna@mobica.com>
Fri, 16 Jun 2017 08:05:22 +0000 (10:05 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 21 Jul 2017 17:52:33 +0000 (19:52 +0200)
This is CTS_ARB_spirv_extensions test implementation.

Affects:

KHR-GL45.spirv_extensions.*

Components: OpenGL, Framework

VK-GL-CTS issue: 501

Change-Id: I6466609d13c237db758c0dbefda285bf39ce680a

43 files changed:
external/openglcts/data/mustpass/gl/khronos_mustpass/4.5.5.x/gl45-master.txt
external/openglcts/modules/gl/CMakeLists.txt
external/openglcts/modules/gl/gl4cSpirvExtensionsTests.cpp [new file with mode: 0644]
external/openglcts/modules/gl/gl4cSpirvExtensionsTests.hpp [new file with mode: 0644]
external/openglcts/modules/gl/gl4cTestPackages.cpp
framework/egl/egluStaticES20Library.inl
framework/egl/egluStaticES30Library.inl
framework/opengl/gluCallLogUtil.inl
framework/opengl/gluCallLogWrapper.inl
framework/opengl/gluCallLogWrapperApi.inl
framework/opengl/gluES3PlusWrapperFuncs.inl
framework/opengl/gluQueryUtil.inl
framework/opengl/gluStrUtil.inl
framework/opengl/gluStrUtilPrototypes.inl
framework/opengl/wrapper/glwApi.inl
framework/opengl/wrapper/glwEnums.inl
framework/opengl/wrapper/glwFunctionTypes.inl
framework/opengl/wrapper/glwFunctions.inl
framework/opengl/wrapper/glwImpl.inl
framework/opengl/wrapper/glwInitES20.inl
framework/opengl/wrapper/glwInitES20Direct.inl
framework/opengl/wrapper/glwInitES30.inl
framework/opengl/wrapper/glwInitES30Direct.inl
framework/opengl/wrapper/glwInitES31.inl
framework/opengl/wrapper/glwInitES31Direct.inl
framework/opengl/wrapper/glwInitES32.inl
framework/opengl/wrapper/glwInitES32Direct.inl
framework/opengl/wrapper/glwInitExtES.inl
framework/opengl/wrapper/glwInitExtGL.inl
framework/opengl/wrapper/glwInitGL30.inl
framework/opengl/wrapper/glwInitGL31.inl
framework/opengl/wrapper/glwInitGL32.inl
framework/opengl/wrapper/glwInitGL33.inl
framework/opengl/wrapper/glwInitGL40.inl
framework/opengl/wrapper/glwInitGL41.inl
framework/opengl/wrapper/glwInitGL42.inl
framework/opengl/wrapper/glwInitGL43.inl
framework/opengl/wrapper/glwInitGL44.inl
framework/opengl/wrapper/glwInitGL45.inl
framework/opengl/wrapper/glwVersions.inl
framework/platform/null/tcuNullRenderContextFuncs.inl
framework/platform/null/tcuNullRenderContextInitFuncs.inl
scripts/opengl/src_util.py

index ed785a7..748839c 100644 (file)
@@ -4940,3 +4940,4 @@ KHR-GL45.limits.max_compute_work_group_size
 KHR-GL45.polygon_offset_clamp.PolygonOffsetClampAvailability
 KHR-GL45.polygon_offset_clamp.PolygonOffsetClampMinMax
 KHR-GL45.polygon_offset_clamp.PolygonOffsetClampZeroInfinity
+KHR-GL45.spirv_extensions.spirv_extensions_queries
index c9a0ef1..7e80250 100644 (file)
@@ -116,6 +116,8 @@ set(GLCTS_GL_SRCS
        gl4cSparseTexture2Tests.hpp
        gl4cSparseTextureClampTests.cpp
        gl4cSparseTextureClampTests.hpp
+       gl4cSpirvExtensionsTests.cpp
+       gl4cSpirvExtensionsTests.hpp
        gl4cParallelShaderCompileTests.cpp
        gl4cParallelShaderCompileTests.hpp
        gl4cPostDepthCoverageTests.cpp
diff --git a/external/openglcts/modules/gl/gl4cSpirvExtensionsTests.cpp b/external/openglcts/modules/gl/gl4cSpirvExtensionsTests.cpp
new file mode 100644 (file)
index 0000000..44b675c
--- /dev/null
@@ -0,0 +1,135 @@
+/*-------------------------------------------------------------------------
+ * OpenGL Conformance Test Suite
+ * -----------------------------
+ *
+ * Copyright (c) 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.
+ *
+ */ /*!
+ * \file
+ * \brief
+ */ /*-------------------------------------------------------------------*/
+
+/**
+ */ /*!
+ * \file  gl4cSpirvExtensionsTests.cpp
+ * \brief Conformance tests for the GL_ARB_spirv_extensions functionality.
+ */ /*-------------------------------------------------------------------*/
+
+#include "gl4cSpirvExtensionsTests.hpp"
+#include "gluContextInfo.hpp"
+#include "gluDefs.hpp"
+#include "gluStrUtil.hpp"
+#include "glwEnums.hpp"
+#include "glwFunctions.hpp"
+#include "tcuTestLog.hpp"
+
+using namespace glw;
+using namespace glu;
+
+namespace gl4cts
+{
+
+/** Constructor.
+ *
+ *  @param context     Rendering context
+ */
+SpirvExtensionsQueriesTestCase::SpirvExtensionsQueriesTestCase(deqp::Context& context)
+       : TestCase(context, "spirv_extensions_queries",
+                          "Verifies if queries for GL_ARB_spirv_extension tokens works as expected")
+{
+       /* Left blank intentionally */
+}
+
+/** Stub init method */
+void SpirvExtensionsQueriesTestCase::init()
+{
+       if (!m_context.getContextInfo().isExtensionSupported("GL_ARB_spirv_extensions"))
+               TCU_THROW(NotSupportedError, "GL_ARB_spirv_extensions not supported");
+
+       if (!m_context.getContextInfo().isExtensionSupported("GL_ARB_gl_spirv"))
+               TCU_THROW(NotSupportedError, "GL_ARB_gl_spirv not supported");
+}
+
+/** Executes test iteration.
+ *
+ *  @return Returns STOP when test has finished executing, CONTINUE if more iterations are needed.
+ */
+tcu::TestNode::IterateResult SpirvExtensionsQueriesTestCase::iterate()
+{
+       const Functions& gl = m_context.getRenderContext().getFunctions();
+
+       GLint numSpirvExtensions;
+       gl.getIntegerv(GL_NUM_SPIR_V_EXTENSIONS, &numSpirvExtensions);
+       GLU_EXPECT_NO_ERROR(gl.getError(), "getIntegerv");
+
+       m_testCtx.getLog() << tcu::TestLog::Message << "GL_NUM_SPIR_V_EXTENSIONS = " << numSpirvExtensions << "\n"
+                                          << tcu::TestLog::EndMessage;
+       for (GLint i = 0; i < numSpirvExtensions; ++i)
+       {
+               const GLubyte* spirvExtension = DE_NULL;
+
+               spirvExtension = gl.getStringi(GL_SPIR_V_EXTENSIONS, i);
+               GLU_EXPECT_NO_ERROR(gl.getError(), "getStringi");
+
+               if (!spirvExtension || strlen((const char*)spirvExtension) == 0)
+               {
+                       m_testCtx.getLog() << tcu::TestLog::Message << "Failed to fetch GL_SPIRV_EXTENSIONS string for index: " << i
+                                                          << "\n"
+                                                          << tcu::TestLog::EndMessage;
+
+                       m_testCtx.setTestResult(QP_TEST_RESULT_FAIL, "Fail");
+                       return STOP;
+               }
+               else
+               {
+                       m_testCtx.getLog() << tcu::TestLog::Message << "GL_SPIR_V_EXTENSION " << i << ": " << spirvExtension << "\n"
+                                                          << tcu::TestLog::EndMessage;
+               }
+       }
+
+       // Test out of bound query
+       gl.getStringi(GL_SPIR_V_EXTENSIONS, numSpirvExtensions);
+       GLenum err = gl.getError();
+       if (err != GL_INVALID_VALUE)
+       {
+               m_testCtx.getLog() << tcu::TestLog::Message
+                                                  << "GetStringi query for GL_SPIRV_EXTENSIONS with index: " << numSpirvExtensions
+                                                  << " should generate INVALID_VALUE error instead of " << glu::getErrorName(err) << "\n"
+                                                  << tcu::TestLog::EndMessage;
+
+               m_testCtx.setTestResult(QP_TEST_RESULT_FAIL, "Fail");
+               return STOP;
+       }
+
+       m_testCtx.setTestResult(QP_TEST_RESULT_PASS, "Pass");
+       return STOP;
+}
+
+/** Constructor.
+ *
+ *  @param context Rendering context.
+ */
+SpirvExtensionsTests::SpirvExtensionsTests(deqp::Context& context)
+       : TestCaseGroup(context, "spirv_extensions", "Verify conformance of GL_ARB_spirv_extensions implementation")
+{
+}
+
+/** Initializes the test group contents. */
+void SpirvExtensionsTests::init()
+{
+       addChild(new SpirvExtensionsQueriesTestCase(m_context));
+}
+
+} /* gl4cts namespace */
diff --git a/external/openglcts/modules/gl/gl4cSpirvExtensionsTests.hpp b/external/openglcts/modules/gl/gl4cSpirvExtensionsTests.hpp
new file mode 100644 (file)
index 0000000..9563745
--- /dev/null
@@ -0,0 +1,76 @@
+#ifndef _GL4CSPIRVEXTENSIONSTESTS_HPP
+#define _GL4CSPIRVEXTENSIONSTESTS_HPP
+/*-------------------------------------------------------------------------
+ * OpenGL Conformance Test Suite
+ * -----------------------------
+ *
+ * Copyright (c) 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.
+ *
+ */ /*!
+ * \file
+ * \brief
+ */ /*-------------------------------------------------------------------*/
+
+/**
+ */ /*!
+ * \file  gl4cSpirvExtensionsTests.cpp
+ * \brief Conformance tests for the GL_ARB_spirv_extensions functionality.
+ */ /*-------------------------------------------------------------------*/
+
+#include "glcTestCase.hpp"
+#include "glwDefs.hpp"
+#include "glwEnums.hpp"
+#include "tcuDefs.hpp"
+
+using namespace glw;
+using namespace glu;
+
+namespace gl4cts
+{
+
+/** Test verifies GetIntegerv query for NUM_SPIR_V_EXTENSIONS <pname>
+ *  and GetStringi query for SPIR_V_EXTENSIONS <pname>
+ **/
+class SpirvExtensionsQueriesTestCase : public deqp::TestCase
+{
+public:
+       /* Public methods */
+       SpirvExtensionsQueriesTestCase(deqp::Context& context);
+
+       void                                             init();
+       tcu::TestNode::IterateResult iterate();
+
+private:
+       /* Private members */
+       /* Private methods */
+};
+
+/** Test group which encapsulates spirv extensions conformance tests */
+class SpirvExtensionsTests : public deqp::TestCaseGroup
+{
+public:
+       /* Public methods */
+       SpirvExtensionsTests(deqp::Context& context);
+
+       void init();
+
+private:
+       SpirvExtensionsTests(const SpirvExtensionsTests& other);
+       SpirvExtensionsTests& operator=(const SpirvExtensionsTests& other);
+};
+
+} /* gl4cts namespace */
+
+#endif // _GL4CSPIRVEXTENSIONSTESTS_HPP
index 3415dd3..67404c6 100644 (file)
@@ -60,6 +60,7 @@
 #include "gl4cSparseTexture2Tests.hpp"
 #include "gl4cSparseTextureClampTests.hpp"
 #include "gl4cSparseTextureTests.hpp"
+#include "gl4cSpirvExtensionsTests.hpp"
 #include "gl4cStencilTexturingTests.hpp"
 #include "gl4cSyncTests.hpp"
 #include "gl4cTextureBarrierTests.hpp"
@@ -366,6 +367,7 @@ void GL45TestPackage::init(void)
                addChild(new gl4cts::ShaderViewportLayerArray(getContext()));
                addChild(new gl4cts::LimitsTests(getContext()));
                addChild(new glcts::PolygonOffsetClamp(getContext()));
+               addChild(new gl4cts::SpirvExtensionsTests(getContext()));
        }
        catch (...)
        {
index fcfa2d9..b7c4656 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
        { "glActiveTexture",                                            (deFunctionPtr)glActiveTexture },
        { "glAttachShader",                                                     (deFunctionPtr)glAttachShader },
index 28e49a7..2214b13 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
        { "glActiveTexture",                                            (deFunctionPtr)glActiveTexture },
        { "glAttachShader",                                                     (deFunctionPtr)glAttachShader },
index 8d720ef..178d19d 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 
 int getTextureParamNumArgs (int pname)
index e9ca3cd..b431d3e 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 
 void CallLogWrapper::glActiveShaderProgram (glw::GLuint pipeline, glw::GLuint program)
@@ -618,13 +618,6 @@ void CallLogWrapper::glCompressedTexImage3D (glw::GLenum target, glw::GLint leve
        m_gl.compressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
-void CallLogWrapper::glCompressedTexImage3DOES (glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLint border, glw::GLsizei imageSize, const void *data)
-{
-       if (m_enableLog)
-               m_log << TestLog::Message << "glCompressedTexImage3DOES(" << toHex(target) << ", " << level << ", " << toHex(internalformat) << ", " << width << ", " << height << ", " << depth << ", " << border << ", " << imageSize << ", " << data << ");" << TestLog::EndMessage;
-       m_gl.compressedTexImage3DOES(target, level, internalformat, width, height, depth, border, imageSize, data);
-}
-
 void CallLogWrapper::glCompressedTexSubImage1D (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLsizei width, glw::GLenum format, glw::GLsizei imageSize, const void *data)
 {
        if (m_enableLog)
@@ -646,13 +639,6 @@ void CallLogWrapper::glCompressedTexSubImage3D (glw::GLenum target, glw::GLint l
        m_gl.compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
-void CallLogWrapper::glCompressedTexSubImage3DOES (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLenum format, glw::GLsizei imageSize, const void *data)
-{
-       if (m_enableLog)
-               m_log << TestLog::Message << "glCompressedTexSubImage3DOES(" << toHex(target) << ", " << level << ", " << xoffset << ", " << yoffset << ", " << zoffset << ", " << width << ", " << height << ", " << depth << ", " << toHex(format) << ", " << imageSize << ", " << data << ");" << TestLog::EndMessage;
-       m_gl.compressedTexSubImage3DOES(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
-}
-
 void CallLogWrapper::glCompressedTextureImage1DEXT (glw::GLuint texture, glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLint border, glw::GLsizei imageSize, const void *bits)
 {
        if (m_enableLog)
@@ -807,13 +793,6 @@ void CallLogWrapper::glCopyTexSubImage3D (glw::GLenum target, glw::GLint level,
        m_gl.copyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
-void CallLogWrapper::glCopyTexSubImage3DOES (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLint x, glw::GLint y, glw::GLsizei width, glw::GLsizei height)
-{
-       if (m_enableLog)
-               m_log << TestLog::Message << "glCopyTexSubImage3DOES(" << toHex(target) << ", " << level << ", " << xoffset << ", " << yoffset << ", " << zoffset << ", " << x << ", " << y << ", " << width << ", " << height << ");" << TestLog::EndMessage;
-       m_gl.copyTexSubImage3DOES(target, level, xoffset, yoffset, zoffset, x, y, width, height);
-}
-
 void CallLogWrapper::glCopyTextureImage1DEXT (glw::GLuint texture, glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLint x, glw::GLint y, glw::GLsizei width, glw::GLint border)
 {
        if (m_enableLog)
@@ -1554,13 +1533,6 @@ void CallLogWrapper::glFramebufferTexture3D (glw::GLenum target, glw::GLenum att
        m_gl.framebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
-void CallLogWrapper::glFramebufferTexture3DOES (glw::GLenum target, glw::GLenum attachment, glw::GLenum textarget, glw::GLuint texture, glw::GLint level, glw::GLint zoffset)
-{
-       if (m_enableLog)
-               m_log << TestLog::Message << "glFramebufferTexture3DOES(" << toHex(target) << ", " << toHex(attachment) << ", " << toHex(textarget) << ", " << texture << ", " << level << ", " << zoffset << ");" << TestLog::EndMessage;
-       m_gl.framebufferTexture3DOES(target, attachment, textarget, texture, level, zoffset);
-}
-
 void CallLogWrapper::glFramebufferTextureLayer (glw::GLenum target, glw::GLenum attachment, glw::GLuint texture, glw::GLint level, glw::GLint layer)
 {
        if (m_enableLog)
@@ -4845,13 +4817,6 @@ void CallLogWrapper::glTexImage3DMultisample (glw::GLenum target, glw::GLsizei s
        m_gl.texImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
-void CallLogWrapper::glTexImage3DOES (glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLint border, glw::GLenum format, glw::GLenum type, const void *pixels)
-{
-       if (m_enableLog)
-               m_log << TestLog::Message << "glTexImage3DOES(" << toHex(target) << ", " << level << ", " << toHex(internalformat) << ", " << width << ", " << height << ", " << depth << ", " << border << ", " << toHex(format) << ", " << toHex(type) << ", " << pixels << ");" << TestLog::EndMessage;
-       m_gl.texImage3DOES(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 void CallLogWrapper::glTexPageCommitmentARB (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLboolean commit)
 {
        if (m_enableLog)
@@ -4957,13 +4922,6 @@ void CallLogWrapper::glTexSubImage3D (glw::GLenum target, glw::GLint level, glw:
        m_gl.texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
-void CallLogWrapper::glTexSubImage3DOES (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLenum format, glw::GLenum type, const void *pixels)
-{
-       if (m_enableLog)
-               m_log << TestLog::Message << "glTexSubImage3DOES(" << toHex(target) << ", " << level << ", " << xoffset << ", " << yoffset << ", " << zoffset << ", " << width << ", " << height << ", " << depth << ", " << toHex(format) << ", " << toHex(type) << ", " << pixels << ");" << TestLog::EndMessage;
-       m_gl.texSubImage3DOES(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-}
-
 void CallLogWrapper::glTextureBarrier (void)
 {
        if (m_enableLog)
index fa824f5..d206cf1 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 void                                   glActiveShaderProgram                                                           (glw::GLuint pipeline, glw::GLuint program);
 void                                   glActiveTexture                                                                         (glw::GLenum texture);
@@ -89,11 +89,9 @@ void                                 glCompressedMultiTexSubImage3DEXT                                       (glw::GLenum texunit, glw::GLenum
 void                                   glCompressedTexImage1D                                                          (glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLint border, glw::GLsizei imageSize, const void *data);
 void                                   glCompressedTexImage2D                                                          (glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLint border, glw::GLsizei imageSize, const void *data);
 void                                   glCompressedTexImage3D                                                          (glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLint border, glw::GLsizei imageSize, const void *data);
-void                                   glCompressedTexImage3DOES                                                       (glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLint border, glw::GLsizei imageSize, const void *data);
 void                                   glCompressedTexSubImage1D                                                       (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLsizei width, glw::GLenum format, glw::GLsizei imageSize, const void *data);
 void                                   glCompressedTexSubImage2D                                                       (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLsizei width, glw::GLsizei height, glw::GLenum format, glw::GLsizei imageSize, const void *data);
 void                                   glCompressedTexSubImage3D                                                       (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLenum format, glw::GLsizei imageSize, const void *data);
-void                                   glCompressedTexSubImage3DOES                                            (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLenum format, glw::GLsizei imageSize, const void *data);
 void                                   glCompressedTextureImage1DEXT                                           (glw::GLuint texture, glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLint border, glw::GLsizei imageSize, const void *bits);
 void                                   glCompressedTextureImage2DEXT                                           (glw::GLuint texture, glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLint border, glw::GLsizei imageSize, const void *bits);
 void                                   glCompressedTextureImage3DEXT                                           (glw::GLuint texture, glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLint border, glw::GLsizei imageSize, const void *bits);
@@ -116,7 +114,6 @@ void                                        glCopyTexImage2D                                                                        (glw::GLenum target, glw::GLint level, glw::GL
 void                                   glCopyTexSubImage1D                                                                     (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint x, glw::GLint y, glw::GLsizei width);
 void                                   glCopyTexSubImage2D                                                                     (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint x, glw::GLint y, glw::GLsizei width, glw::GLsizei height);
 void                                   glCopyTexSubImage3D                                                                     (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLint x, glw::GLint y, glw::GLsizei width, glw::GLsizei height);
-void                                   glCopyTexSubImage3DOES                                                          (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLint x, glw::GLint y, glw::GLsizei width, glw::GLsizei height);
 void                                   glCopyTextureImage1DEXT                                                         (glw::GLuint texture, glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLint x, glw::GLint y, glw::GLsizei width, glw::GLint border);
 void                                   glCopyTextureImage2DEXT                                                         (glw::GLuint texture, glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLint x, glw::GLint y, glw::GLsizei width, glw::GLsizei height, glw::GLint border);
 void                                   glCopyTextureSubImage1D                                                         (glw::GLuint texture, glw::GLint level, glw::GLint xoffset, glw::GLint x, glw::GLint y, glw::GLsizei width);
@@ -221,7 +218,6 @@ void                                        glFramebufferTexture                                                            (glw::GLenum target, glw::GLenum attachment
 void                                   glFramebufferTexture1D                                                          (glw::GLenum target, glw::GLenum attachment, glw::GLenum textarget, glw::GLuint texture, glw::GLint level);
 void                                   glFramebufferTexture2D                                                          (glw::GLenum target, glw::GLenum attachment, glw::GLenum textarget, glw::GLuint texture, glw::GLint level);
 void                                   glFramebufferTexture3D                                                          (glw::GLenum target, glw::GLenum attachment, glw::GLenum textarget, glw::GLuint texture, glw::GLint level, glw::GLint zoffset);
-void                                   glFramebufferTexture3DOES                                                       (glw::GLenum target, glw::GLenum attachment, glw::GLenum textarget, glw::GLuint texture, glw::GLint level, glw::GLint zoffset);
 void                                   glFramebufferTextureLayer                                                       (glw::GLenum target, glw::GLenum attachment, glw::GLuint texture, glw::GLint level, glw::GLint layer);
 void                                   glFrontFace                                                                                     (glw::GLenum mode);
 void                                   glGenBuffers                                                                            (glw::GLsizei n, glw::GLuint *buffers);
@@ -661,7 +657,6 @@ void                                        glTexImage2D                                                                            (glw::GLenum target, glw::GLint level, glw::GLint
 void                                   glTexImage2DMultisample                                                         (glw::GLenum target, glw::GLsizei samples, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLboolean fixedsamplelocations);
 void                                   glTexImage3D                                                                            (glw::GLenum target, glw::GLint level, glw::GLint internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLint border, glw::GLenum format, glw::GLenum type, const void *pixels);
 void                                   glTexImage3DMultisample                                                         (glw::GLenum target, glw::GLsizei samples, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLboolean fixedsamplelocations);
-void                                   glTexImage3DOES                                                                         (glw::GLenum target, glw::GLint level, glw::GLenum internalformat, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLint border, glw::GLenum format, glw::GLenum type, const void *pixels);
 void                                   glTexPageCommitmentARB                                                          (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLboolean commit);
 void                                   glTexParameterIiv                                                                       (glw::GLenum target, glw::GLenum pname, const glw::GLint *params);
 void                                   glTexParameterIuiv                                                                      (glw::GLenum target, glw::GLenum pname, const glw::GLuint *params);
@@ -677,7 +672,6 @@ void                                        glTexStorage3DMultisample                                                       (glw::GLenum target, glw::GLsizei sampl
 void                                   glTexSubImage1D                                                                         (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLsizei width, glw::GLenum format, glw::GLenum type, const void *pixels);
 void                                   glTexSubImage2D                                                                         (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLsizei width, glw::GLsizei height, glw::GLenum format, glw::GLenum type, const void *pixels);
 void                                   glTexSubImage3D                                                                         (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLenum format, glw::GLenum type, const void *pixels);
-void                                   glTexSubImage3DOES                                                                      (glw::GLenum target, glw::GLint level, glw::GLint xoffset, glw::GLint yoffset, glw::GLint zoffset, glw::GLsizei width, glw::GLsizei height, glw::GLsizei depth, glw::GLenum format, glw::GLenum type, const void *pixels);
 void                                   glTextureBarrier                                                                        (void);
 void                                   glTextureBuffer                                                                         (glw::GLuint texture, glw::GLenum internalformat, glw::GLuint buffer);
 void                                   glTextureBufferEXT                                                                      (glw::GLuint texture, glw::GLenum target, glw::GLenum internalformat, glw::GLuint buffer);
index cede76a..749eada 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 dst->activeShaderProgram                                       = src.activeShaderProgram;
 dst->activeTexture                                                     = src.activeTexture;
index 45e4858..557ecd0 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 
 int getBasicQueryNumArgsOut (int pname)
index 9707cf4..19d5744 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 
 const char* getErrorName (int value)
index 0842272..38af75d 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 const char*                                                    getErrorName                                                    (int value);
 const char*                                                    getTypeName                                                             (int value);
index 1000cf0..01b76ee 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 #define                        glActiveShaderProgram                                                           glwActiveShaderProgram
 #define                        glActiveTexture                                                                         glwActiveTexture
 #define                        glCompressedTexImage1D                                                          glwCompressedTexImage1D
 #define                        glCompressedTexImage2D                                                          glwCompressedTexImage2D
 #define                        glCompressedTexImage3D                                                          glwCompressedTexImage3D
-#define                        glCompressedTexImage3DOES                                                       glwCompressedTexImage3DOES
 #define                        glCompressedTexSubImage1D                                                       glwCompressedTexSubImage1D
 #define                        glCompressedTexSubImage2D                                                       glwCompressedTexSubImage2D
 #define                        glCompressedTexSubImage3D                                                       glwCompressedTexSubImage3D
-#define                        glCompressedTexSubImage3DOES                                            glwCompressedTexSubImage3DOES
 #define                        glCompressedTextureImage1DEXT                                           glwCompressedTextureImage1DEXT
 #define                        glCompressedTextureImage2DEXT                                           glwCompressedTextureImage2DEXT
 #define                        glCompressedTextureImage3DEXT                                           glwCompressedTextureImage3DEXT
 #define                        glCopyTexSubImage1D                                                                     glwCopyTexSubImage1D
 #define                        glCopyTexSubImage2D                                                                     glwCopyTexSubImage2D
 #define                        glCopyTexSubImage3D                                                                     glwCopyTexSubImage3D
-#define                        glCopyTexSubImage3DOES                                                          glwCopyTexSubImage3DOES
 #define                        glCopyTextureImage1DEXT                                                         glwCopyTextureImage1DEXT
 #define                        glCopyTextureImage2DEXT                                                         glwCopyTextureImage2DEXT
 #define                        glCopyTextureSubImage1D                                                         glwCopyTextureSubImage1D
 #define                        glFramebufferTexture1D                                                          glwFramebufferTexture1D
 #define                        glFramebufferTexture2D                                                          glwFramebufferTexture2D
 #define                        glFramebufferTexture3D                                                          glwFramebufferTexture3D
-#define                        glFramebufferTexture3DOES                                                       glwFramebufferTexture3DOES
 #define                        glFramebufferTextureLayer                                                       glwFramebufferTextureLayer
 #define                        glFrontFace                                                                                     glwFrontFace
 #define                        glGenBuffers                                                                            glwGenBuffers
 #define                        glTexImage2DMultisample                                                         glwTexImage2DMultisample
 #define                        glTexImage3D                                                                            glwTexImage3D
 #define                        glTexImage3DMultisample                                                         glwTexImage3DMultisample
-#define                        glTexImage3DOES                                                                         glwTexImage3DOES
 #define                        glTexPageCommitmentARB                                                          glwTexPageCommitmentARB
 #define                        glTexParameterIiv                                                                       glwTexParameterIiv
 #define                        glTexParameterIuiv                                                                      glwTexParameterIuiv
 #define                        glTexSubImage1D                                                                         glwTexSubImage1D
 #define                        glTexSubImage2D                                                                         glwTexSubImage2D
 #define                        glTexSubImage3D                                                                         glwTexSubImage3D
-#define                        glTexSubImage3DOES                                                                      glwTexSubImage3DOES
 #define                        glTextureBarrier                                                                        glwTextureBarrier
 #define                        glTextureBuffer                                                                         glwTextureBuffer
 #define                        glTextureBufferEXT                                                                      glwTextureBufferEXT
@@ -978,11 +972,9 @@ void                       glwCompressedMultiTexSubImage3DEXT                                      (GLenum texunit, GLenum target, GL
 void                   glwCompressedTexImage1D                                                         (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
 void                   glwCompressedTexImage2D                                                         (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
 void                   glwCompressedTexImage3D                                                         (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
-void                   glwCompressedTexImage3DOES                                                      (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
 void                   glwCompressedTexSubImage1D                                                      (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
 void                   glwCompressedTexSubImage2D                                                      (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
 void                   glwCompressedTexSubImage3D                                                      (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-void                   glwCompressedTexSubImage3DOES                                           (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
 void                   glwCompressedTextureImage1DEXT                                          (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
 void                   glwCompressedTextureImage2DEXT                                          (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
 void                   glwCompressedTextureImage3DEXT                                          (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
@@ -1005,7 +997,6 @@ void                       glwCopyTexImage2D                                                                       (GLenum target, GLint level, GLenum internalfor
 void                   glwCopyTexSubImage1D                                                            (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
 void                   glwCopyTexSubImage2D                                                            (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 void                   glwCopyTexSubImage3D                                                            (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-void                   glwCopyTexSubImage3DOES                                                         (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 void                   glwCopyTextureImage1DEXT                                                        (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
 void                   glwCopyTextureImage2DEXT                                                        (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
 void                   glwCopyTextureSubImage1D                                                        (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
@@ -1110,7 +1101,6 @@ void                      glwFramebufferTexture                                                           (GLenum target, GLenum attachment, GLuint te
 void                   glwFramebufferTexture1D                                                         (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 void                   glwFramebufferTexture2D                                                         (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 void                   glwFramebufferTexture3D                                                         (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-void                   glwFramebufferTexture3DOES                                                      (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
 void                   glwFramebufferTextureLayer                                                      (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
 void                   glwFrontFace                                                                            (GLenum mode);
 void                   glwGenBuffers                                                                           (GLsizei n, GLuint *buffers);
@@ -1550,7 +1540,6 @@ void                      glwTexImage2D                                                                           (GLenum target, GLint level, GLint internalformat,
 void                   glwTexImage2DMultisample                                                        (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
 void                   glwTexImage3D                                                                           (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
 void                   glwTexImage3DMultisample                                                        (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-void                   glwTexImage3DOES                                                                        (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
 void                   glwTexPageCommitmentARB                                                         (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
 void                   glwTexParameterIiv                                                                      (GLenum target, GLenum pname, const GLint *params);
 void                   glwTexParameterIuiv                                                                     (GLenum target, GLenum pname, const GLuint *params);
@@ -1566,7 +1555,6 @@ void                      glwTexStorage3DMultisample                                                      (GLenum target, GLsizei samples, GLenum
 void                   glwTexSubImage1D                                                                        (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
 void                   glwTexSubImage2D                                                                        (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
 void                   glwTexSubImage3D                                                                        (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
-void                   glwTexSubImage3DOES                                                                     (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
 void                   glwTextureBarrier                                                                       ();
 void                   glwTextureBuffer                                                                        (GLuint texture, GLenum internalformat, GLuint buffer);
 void                   glwTextureBufferEXT                                                                     (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
index 933ea17..d04c56b 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 #define GL_DEPTH_BUFFER_BIT                                                                                            0x00000100
 #define GL_STENCIL_BUFFER_BIT                                                                                  0x00000400
 #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR                                              0x93DC
 #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12                                                  0x93DD
 #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR                                              0x93DD
+#define GL_SPIR_V_EXTENSIONS                                                                                   0x9553
+#define GL_NUM_SPIR_V_EXTENSIONS                                                                               0x9554
index 9aedbc2..4748254 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 typedef GLW_APICALL void                       (GLW_APIENTRY* glActiveShaderProgramFunc)                                                               (GLuint pipeline, GLuint program);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glActiveTextureFunc)                                                                             (GLenum texture);
@@ -89,11 +89,9 @@ typedef GLW_APICALL void                     (GLW_APIENTRY* glCompressedMultiTexSubImage3DEXTFunc)
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTexImage1DFunc)                                                              (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTexImage2DFunc)                                                              (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTexImage3DFunc)                                                              (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
-typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTexImage3DOESFunc)                                                   (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTexSubImage1DFunc)                                                   (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTexSubImage2DFunc)                                                   (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTexSubImage3DFunc)                                                   (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTexSubImage3DOESFunc)                                                (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTextureImage1DEXTFunc)                                               (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTextureImage2DEXTFunc)                                               (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCompressedTextureImage3DEXTFunc)                                               (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
@@ -116,7 +114,6 @@ typedef GLW_APICALL void                    (GLW_APIENTRY* glCopyTexImage2DFunc)                                                                    (GLenum
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCopyTexSubImage1DFunc)                                                                 (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCopyTexSubImage2DFunc)                                                                 (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCopyTexSubImage3DFunc)                                                                 (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef GLW_APICALL void                       (GLW_APIENTRY* glCopyTexSubImage3DOESFunc)                                                              (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCopyTextureImage1DEXTFunc)                                                             (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCopyTextureImage2DEXTFunc)                                                             (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glCopyTextureSubImage1DFunc)                                                             (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
@@ -221,7 +218,6 @@ typedef GLW_APICALL void                    (GLW_APIENTRY* glFramebufferTextureFunc)                                                                (GLen
 typedef GLW_APICALL void                       (GLW_APIENTRY* glFramebufferTexture1DFunc)                                                              (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glFramebufferTexture2DFunc)                                                              (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glFramebufferTexture3DFunc)                                                              (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef GLW_APICALL void                       (GLW_APIENTRY* glFramebufferTexture3DOESFunc)                                                   (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glFramebufferTextureLayerFunc)                                                   (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glFrontFaceFunc)                                                                                 (GLenum mode);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glGenBuffersFunc)                                                                                (GLsizei n, GLuint *buffers);
@@ -661,7 +657,6 @@ typedef GLW_APICALL void                    (GLW_APIENTRY* glTexImage2DFunc)                                                                                (GLenum tar
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTexImage2DMultisampleFunc)                                                             (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTexImage3DFunc)                                                                                (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTexImage3DMultisampleFunc)                                                             (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-typedef GLW_APICALL void                       (GLW_APIENTRY* glTexImage3DOESFunc)                                                                             (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTexPageCommitmentARBFunc)                                                              (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTexParameterIivFunc)                                                                   (GLenum target, GLenum pname, const GLint *params);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTexParameterIuivFunc)                                                                  (GLenum target, GLenum pname, const GLuint *params);
@@ -677,7 +672,6 @@ typedef GLW_APICALL void                    (GLW_APIENTRY* glTexStorage3DMultisampleFunc)                                                   (
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTexSubImage1DFunc)                                                                             (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTexSubImage2DFunc)                                                                             (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTexSubImage3DFunc)                                                                             (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
-typedef GLW_APICALL void                       (GLW_APIENTRY* glTexSubImage3DOESFunc)                                                                  (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTextureBarrierFunc)                                                                    (void);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTextureBufferFunc)                                                                             (GLuint texture, GLenum internalformat, GLuint buffer);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glTextureBufferEXTFunc)                                                                  (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
index 2ae9a2b..37c3daa 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 glActiveShaderProgramFunc                                                              activeShaderProgram;
 glActiveTextureFunc                                                                            activeTexture;
@@ -89,11 +89,9 @@ glCompressedMultiTexSubImage3DEXTFunc                                        compressedMultiTexSubImage3DEXT;
 glCompressedTexImage1DFunc                                                             compressedTexImage1D;
 glCompressedTexImage2DFunc                                                             compressedTexImage2D;
 glCompressedTexImage3DFunc                                                             compressedTexImage3D;
-glCompressedTexImage3DOESFunc                                                  compressedTexImage3DOES;
 glCompressedTexSubImage1DFunc                                                  compressedTexSubImage1D;
 glCompressedTexSubImage2DFunc                                                  compressedTexSubImage2D;
 glCompressedTexSubImage3DFunc                                                  compressedTexSubImage3D;
-glCompressedTexSubImage3DOESFunc                                               compressedTexSubImage3DOES;
 glCompressedTextureImage1DEXTFunc                                              compressedTextureImage1DEXT;
 glCompressedTextureImage2DEXTFunc                                              compressedTextureImage2DEXT;
 glCompressedTextureImage3DEXTFunc                                              compressedTextureImage3DEXT;
@@ -116,7 +114,6 @@ glCopyTexImage2DFunc                                                                        copyTexImage2D;
 glCopyTexSubImage1DFunc                                                                        copyTexSubImage1D;
 glCopyTexSubImage2DFunc                                                                        copyTexSubImage2D;
 glCopyTexSubImage3DFunc                                                                        copyTexSubImage3D;
-glCopyTexSubImage3DOESFunc                                                             copyTexSubImage3DOES;
 glCopyTextureImage1DEXTFunc                                                            copyTextureImage1DEXT;
 glCopyTextureImage2DEXTFunc                                                            copyTextureImage2DEXT;
 glCopyTextureSubImage1DFunc                                                            copyTextureSubImage1D;
@@ -221,7 +218,6 @@ glFramebufferTextureFunc                                                            framebufferTexture;
 glFramebufferTexture1DFunc                                                             framebufferTexture1D;
 glFramebufferTexture2DFunc                                                             framebufferTexture2D;
 glFramebufferTexture3DFunc                                                             framebufferTexture3D;
-glFramebufferTexture3DOESFunc                                                  framebufferTexture3DOES;
 glFramebufferTextureLayerFunc                                                  framebufferTextureLayer;
 glFrontFaceFunc                                                                                        frontFace;
 glGenBuffersFunc                                                                               genBuffers;
@@ -661,7 +657,6 @@ glTexImage2DFunc                                                                            texImage2D;
 glTexImage2DMultisampleFunc                                                            texImage2DMultisample;
 glTexImage3DFunc                                                                               texImage3D;
 glTexImage3DMultisampleFunc                                                            texImage3DMultisample;
-glTexImage3DOESFunc                                                                            texImage3DOES;
 glTexPageCommitmentARBFunc                                                             texPageCommitmentARB;
 glTexParameterIivFunc                                                                  texParameterIiv;
 glTexParameterIuivFunc                                                                 texParameterIuiv;
@@ -677,7 +672,6 @@ glTexStorage3DMultisampleFunc                                                       texStorage3DMultisample;
 glTexSubImage1DFunc                                                                            texSubImage1D;
 glTexSubImage2DFunc                                                                            texSubImage2D;
 glTexSubImage3DFunc                                                                            texSubImage3D;
-glTexSubImage3DOESFunc                                                                 texSubImage3DOES;
 glTextureBarrierFunc                                                                   textureBarrier;
 glTextureBufferFunc                                                                            textureBuffer;
 glTextureBufferEXTFunc                                                                 textureBufferEXT;
index fecc729..e636909 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 
 void glwActiveShaderProgram (GLuint pipeline, GLuint program)
@@ -692,14 +692,6 @@ void glwCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat,
        gl->compressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
-void glwCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
-{
-       const glw::Functions* gl = glw::getCurrentThreadFunctions();
-       if (!gl)
-               return;
-       gl->compressedTexImage3DOES(target, level, internalformat, width, height, depth, border, imageSize, data);
-}
-
 void glwCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)
 {
        const glw::Functions* gl = glw::getCurrentThreadFunctions();
@@ -724,14 +716,6 @@ void glwCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLin
        gl->compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
-void glwCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
-{
-       const glw::Functions* gl = glw::getCurrentThreadFunctions();
-       if (!gl)
-               return;
-       gl->compressedTexSubImage3DOES(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
-}
-
 void glwCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits)
 {
        const glw::Functions* gl = glw::getCurrentThreadFunctions();
@@ -908,14 +892,6 @@ void glwCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoff
        gl->copyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
-void glwCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-       const glw::Functions* gl = glw::getCurrentThreadFunctions();
-       if (!gl)
-               return;
-       gl->copyTexSubImage3DOES(target, level, xoffset, yoffset, zoffset, x, y, width, height);
-}
-
 void glwCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
        const glw::Functions* gl = glw::getCurrentThreadFunctions();
@@ -1748,14 +1724,6 @@ void glwFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget
        gl->framebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
-void glwFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
-{
-       const glw::Functions* gl = glw::getCurrentThreadFunctions();
-       if (!gl)
-               return;
-       gl->framebufferTexture3DOES(target, attachment, textarget, texture, level, zoffset);
-}
-
 void glwFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
        const glw::Functions* gl = glw::getCurrentThreadFunctions();
@@ -5268,14 +5236,6 @@ void glwTexImage3DMultisample (GLenum target, GLsizei samples, GLenum internalfo
        gl->texImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
-void glwTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)
-{
-       const glw::Functions* gl = glw::getCurrentThreadFunctions();
-       if (!gl)
-               return;
-       gl->texImage3DOES(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 void glwTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit)
 {
        const glw::Functions* gl = glw::getCurrentThreadFunctions();
@@ -5396,14 +5356,6 @@ void glwTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset,
        gl->texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
-void glwTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
-{
-       const glw::Functions* gl = glw::getCurrentThreadFunctions();
-       if (!gl)
-               return;
-       gl->texSubImage3DOES(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-}
-
 void glwTextureBarrier (void)
 {
        const glw::Functions* gl = glw::getCurrentThreadFunctions();
index 5d42df2..44cd1fd 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");
index edd9e89..2ac4602 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeTexture                                              = &glActiveTexture;
 gl->attachShader                                               = &glAttachShader;
index ecd2021..b62bfcd 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");
index b97bcb1..f6ef805 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeTexture                                              = &glActiveTexture;
 gl->attachShader                                               = &glAttachShader;
index 7912f0e..44da499 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                        = (glActiveShaderProgramFunc)                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
index 7dc6b52..e2d8839 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                        = &glActiveShaderProgram;
 gl->activeTexture                                              = &glActiveTexture;
index d74bbdf..d7d9b32 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                        = (glActiveShaderProgramFunc)                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
index bfb0bab..155ac7d 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                        = &glActiveShaderProgram;
 gl->activeTexture                                              = &glActiveTexture;
index df6c1e4..f1d3497 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 
 if (de::contains(extSet, "GL_KHR_blend_equation_advanced"))
@@ -129,12 +129,12 @@ if (de::contains(extSet, "GL_OES_EGL_image"))
 
 if (de::contains(extSet, "GL_OES_texture_3D"))
 {
-       gl->compressedTexImage3DOES             = (glCompressedTexImage3DOESFunc)               loader->get("glCompressedTexImage3DOES");
-       gl->compressedTexSubImage3DOES  = (glCompressedTexSubImage3DOESFunc)    loader->get("glCompressedTexSubImage3DOES");
-       gl->copyTexSubImage3DOES                = (glCopyTexSubImage3DOESFunc)                  loader->get("glCopyTexSubImage3DOES");
-       gl->framebufferTexture3DOES             = (glFramebufferTexture3DOESFunc)               loader->get("glFramebufferTexture3DOES");
-       gl->texImage3DOES                               = (glTexImage3DOESFunc)                                 loader->get("glTexImage3DOES");
-       gl->texSubImage3DOES                    = (glTexSubImage3DOESFunc)                              loader->get("glTexSubImage3DOES");
+       gl->compressedTexImage3D        = (glCompressedTexImage3DFunc)          loader->get("glCompressedTexImage3DOES");
+       gl->compressedTexSubImage3D     = (glCompressedTexSubImage3DFunc)       loader->get("glCompressedTexSubImage3DOES");
+       gl->copyTexSubImage3D           = (glCopyTexSubImage3DFunc)                     loader->get("glCopyTexSubImage3DOES");
+       gl->framebufferTexture3D        = (glFramebufferTexture3DFunc)          loader->get("glFramebufferTexture3DOES");
+       gl->texImage3D                          = (glTexImage3DFunc)                            loader->get("glTexImage3DOES");
+       gl->texSubImage3D                       = (glTexSubImage3DFunc)                         loader->get("glTexSubImage3DOES");
 }
 
 if (de::contains(extSet, "GL_OES_texture_storage_multisample_2d_array"))
index 1da2c34..b766a48 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 
 if (de::contains(extSet, "GL_KHR_blend_equation_advanced"))
index 5592a6e..6650ae2 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");
index 6ef5233..2ab9e50 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");
index 4a132d1..d8752e4 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");
index ad58e27..b3d56d3 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");
index 8676868..c0952f4 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
 gl->attachShader                                               = (glAttachShaderFunc)                                                  loader->get("glAttachShader");
index b320e5a..bb93ac4 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                        = (glActiveShaderProgramFunc)                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                              = (glActiveTextureFunc)                                                 loader->get("glActiveTexture");
index d730ece..1d3cd17 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                                        = (glActiveShaderProgramFunc)                                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                                              = (glActiveTextureFunc)                                                                 loader->get("glActiveTexture");
index 803b342..1dee18e 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                                        = (glActiveShaderProgramFunc)                                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                                              = (glActiveTextureFunc)                                                                 loader->get("glActiveTexture");
index 4d3b4b9..8714f86 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                                        = (glActiveShaderProgramFunc)                                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                                              = (glActiveTextureFunc)                                                                 loader->get("glActiveTexture");
index eda0043..60b516e 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                                        = (glActiveShaderProgramFunc)                                                   loader->get("glActiveShaderProgram");
 gl->activeTexture                                                              = (glActiveTextureFunc)                                                                 loader->get("glActiveTexture");
index addc9b6..85583c4 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 #define GL_ES_VERSION_2_0      1
 #define GL_ES_VERSION_3_0      1
index cb470f2..af78eb8 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 
 GLW_APICALL void GLW_APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program)
@@ -767,20 +767,6 @@ GLW_APICALL void GLW_APIENTRY glCompressedTexImage3D (GLenum target, GLint level
 
 }
 
-GLW_APICALL void GLW_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
-{
-       DE_UNREF(target);
-       DE_UNREF(level);
-       DE_UNREF(internalformat);
-       DE_UNREF(width);
-       DE_UNREF(height);
-       DE_UNREF(depth);
-       DE_UNREF(border);
-       DE_UNREF(imageSize);
-       DE_UNREF(data);
-
-}
-
 GLW_APICALL void GLW_APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)
 {
        DE_UNREF(target);
@@ -823,22 +809,6 @@ GLW_APICALL void GLW_APIENTRY glCompressedTexSubImage3D (GLenum target, GLint le
 
 }
 
-GLW_APICALL void GLW_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
-{
-       DE_UNREF(target);
-       DE_UNREF(level);
-       DE_UNREF(xoffset);
-       DE_UNREF(yoffset);
-       DE_UNREF(zoffset);
-       DE_UNREF(width);
-       DE_UNREF(height);
-       DE_UNREF(depth);
-       DE_UNREF(format);
-       DE_UNREF(imageSize);
-       DE_UNREF(data);
-
-}
-
 GLW_APICALL void GLW_APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits)
 {
        DE_UNREF(texture);
@@ -1139,20 +1109,6 @@ GLW_APICALL void GLW_APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, G
 
 }
 
-GLW_APICALL void GLW_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-       DE_UNREF(target);
-       DE_UNREF(level);
-       DE_UNREF(xoffset);
-       DE_UNREF(yoffset);
-       DE_UNREF(zoffset);
-       DE_UNREF(x);
-       DE_UNREF(y);
-       DE_UNREF(width);
-       DE_UNREF(height);
-
-}
-
 GLW_APICALL void GLW_APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
        DE_UNREF(texture);
@@ -1967,17 +1923,6 @@ GLW_APICALL void GLW_APIENTRY glFramebufferTexture3D (GLenum target, GLenum atta
 
 }
 
-GLW_APICALL void GLW_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
-{
-       DE_UNREF(target);
-       DE_UNREF(attachment);
-       DE_UNREF(textarget);
-       DE_UNREF(texture);
-       DE_UNREF(level);
-       DE_UNREF(zoffset);
-
-}
-
 GLW_APICALL void GLW_APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
        DE_UNREF(target);
@@ -5699,21 +5644,6 @@ GLW_APICALL void GLW_APIENTRY glTexImage3DMultisample (GLenum target, GLsizei sa
 
 }
 
-GLW_APICALL void GLW_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)
-{
-       DE_UNREF(target);
-       DE_UNREF(level);
-       DE_UNREF(internalformat);
-       DE_UNREF(width);
-       DE_UNREF(height);
-       DE_UNREF(depth);
-       DE_UNREF(border);
-       DE_UNREF(format);
-       DE_UNREF(type);
-       DE_UNREF(pixels);
-
-}
-
 GLW_APICALL void GLW_APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit)
 {
        DE_UNREF(target);
@@ -5871,22 +5801,6 @@ GLW_APICALL void GLW_APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint
 
 }
 
-GLW_APICALL void GLW_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
-{
-       DE_UNREF(target);
-       DE_UNREF(level);
-       DE_UNREF(xoffset);
-       DE_UNREF(yoffset);
-       DE_UNREF(zoffset);
-       DE_UNREF(width);
-       DE_UNREF(height);
-       DE_UNREF(depth);
-       DE_UNREF(format);
-       DE_UNREF(type);
-       DE_UNREF(pixels);
-
-}
-
 GLW_APICALL void GLW_APIENTRY glTextureBarrier (void)
 {
 
index 1ce3664..90e984a 100644 (file)
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos GL API description (gl.xml) revision 97558118d4a8ab2af749867899555273c20827ce.
+ * Generated from Khronos GL API description (gl.xml) revision a27ed07cbf0a6240dcc7ac030f975af0c85d51a0.
  */
 gl->activeShaderProgram                                                                = glActiveShaderProgram;
 gl->activeTexture                                                                      = glActiveTexture;
@@ -89,11 +89,9 @@ gl->compressedMultiTexSubImage3DEXT                                  = glCompressedMultiTexSubImage3DEXT;
 gl->compressedTexImage1D                                                       = glCompressedTexImage1D;
 gl->compressedTexImage2D                                                       = glCompressedTexImage2D;
 gl->compressedTexImage3D                                                       = glCompressedTexImage3D;
-gl->compressedTexImage3DOES                                                    = glCompressedTexImage3DOES;
 gl->compressedTexSubImage1D                                                    = glCompressedTexSubImage1D;
 gl->compressedTexSubImage2D                                                    = glCompressedTexSubImage2D;
 gl->compressedTexSubImage3D                                                    = glCompressedTexSubImage3D;
-gl->compressedTexSubImage3DOES                                         = glCompressedTexSubImage3DOES;
 gl->compressedTextureImage1DEXT                                                = glCompressedTextureImage1DEXT;
 gl->compressedTextureImage2DEXT                                                = glCompressedTextureImage2DEXT;
 gl->compressedTextureImage3DEXT                                                = glCompressedTextureImage3DEXT;
@@ -116,7 +114,6 @@ gl->copyTexImage2D                                                                  = glCopyTexImage2D;
 gl->copyTexSubImage1D                                                          = glCopyTexSubImage1D;
 gl->copyTexSubImage2D                                                          = glCopyTexSubImage2D;
 gl->copyTexSubImage3D                                                          = glCopyTexSubImage3D;
-gl->copyTexSubImage3DOES                                                       = glCopyTexSubImage3DOES;
 gl->copyTextureImage1DEXT                                                      = glCopyTextureImage1DEXT;
 gl->copyTextureImage2DEXT                                                      = glCopyTextureImage2DEXT;
 gl->copyTextureSubImage1D                                                      = glCopyTextureSubImage1D;
@@ -221,7 +218,6 @@ gl->framebufferTexture                                                              = glFramebufferTexture;
 gl->framebufferTexture1D                                                       = glFramebufferTexture1D;
 gl->framebufferTexture2D                                                       = glFramebufferTexture2D;
 gl->framebufferTexture3D                                                       = glFramebufferTexture3D;
-gl->framebufferTexture3DOES                                                    = glFramebufferTexture3DOES;
 gl->framebufferTextureLayer                                                    = glFramebufferTextureLayer;
 gl->frontFace                                                                          = glFrontFace;
 gl->genBuffers                                                                         = glGenBuffers;
@@ -661,7 +657,6 @@ gl->texImage2D                                                                              = glTexImage2D;
 gl->texImage2DMultisample                                                      = glTexImage2DMultisample;
 gl->texImage3D                                                                         = glTexImage3D;
 gl->texImage3DMultisample                                                      = glTexImage3DMultisample;
-gl->texImage3DOES                                                                      = glTexImage3DOES;
 gl->texPageCommitmentARB                                                       = glTexPageCommitmentARB;
 gl->texParameterIiv                                                                    = glTexParameterIiv;
 gl->texParameterIuiv                                                           = glTexParameterIuiv;
@@ -677,7 +672,6 @@ gl->texStorage3DMultisample                                                 = glTexStorage3DMultisample;
 gl->texSubImage1D                                                                      = glTexSubImage1D;
 gl->texSubImage2D                                                                      = glTexSubImage2D;
 gl->texSubImage3D                                                                      = glTexSubImage3D;
-gl->texSubImage3DOES                                                           = glTexSubImage3DOES;
 gl->textureBarrier                                                                     = glTextureBarrier;
 gl->textureBuffer                                                                      = glTextureBuffer;
 gl->textureBufferEXT                                                           = glTextureBufferEXT;
index a74b3a2..994dfc4 100644 (file)
@@ -36,10 +36,10 @@ EGL_DIR                             = os.path.normpath(os.path.join(SCRIPTS_DIR, "..", "..", "framework",
 OPENGL_INC_DIR         = os.path.join(OPENGL_DIR, "wrapper")
 
 GL_SOURCE                      = khr_util.registry_cache.RegistrySource(
-                                               "https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry",
+                                               "git@gitlab.khronos.org:opengl/registry.git",
                                                "xml/gl.xml",
-                                               "97558118d4a8ab2af749867899555273c20827ce",
-                                               "2475e1ff6d69048e67a49188d8be09195b261ed96b2b4108a0f7d7a459834674")
+                                               "a27ed07cbf0a6240dcc7ac030f975af0c85d51a0",
+                                               "3b653b7b49fe271f16c73b64251087103801632d6f381110cf8b2f1dbe301e15")
 
 EXTENSIONS                     = [
        'GL_KHR_texture_compression_astc_ldr',
@@ -111,6 +111,7 @@ EXTENSIONS                  = [
        'GL_ARB_shader_viewport_layer_array',
        'GL_ARB_sparse_buffer',
        'GL_ARB_sparse_texture',
+       'GL_ARB_spirv_extensions',
        'GL_ARB_tessellation_shader',
        'GL_ARB_texture_barrier',
        'GL_ARB_texture_filter_minmax',