summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Leech <devrel@oddhack.org>2017-08-08 13:13:07 -0700
committerGitHub <noreply@github.com>2017-08-08 13:13:07 -0700
commita3ee0ed08111d44ac3cb863d9e3e81a7c28f9d90 (patch)
treee94522506b90c549b6354ba35135e0a3707fa0c8
parent9df96757eb43626917e5ee509c4943264c38308c (diff)
parent6008d71ba04209e2ea1a06ca483aa38e7d23534f (diff)
downloadopengl-registry-master.zip
opengl-registry-master.tar.xz
Merge pull request #92 from alegal-arm/masterHEADmaster
Add GL_KHR_parallel_shader_compile to the registry
-rwxr-xr-xapi/GL/glcorearb.h10
-rw-r--r--api/GL/glext.h12
-rw-r--r--api/GLES/gl.h2
-rw-r--r--api/GLES/glext.h2
-rw-r--r--api/GLES2/gl2.h2
-rw-r--r--api/GLES2/gl2ext.h12
-rw-r--r--api/GLES3/gl3.h2
-rw-r--r--xml/gl.xml18
8 files changed, 52 insertions, 8 deletions
diff --git a/api/GL/glcorearb.h b/api/GL/glcorearb.h
index 071b0c5..f5d9642 100755
--- a/api/GL/glcorearb.h
+++ b/api/GL/glcorearb.h
@@ -3899,6 +3899,16 @@ GLAPI void APIENTRY glBlendBarrierKHR (void);
#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008
#endif /* GL_KHR_no_error */
+#ifndef GL_KHR_parallel_shader_compile
+#define GL_KHR_parallel_shader_compile 1
+#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
+#define GL_COMPLETION_STATUS_KHR 0x91B1
+typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
+#endif
+#endif /* GL_KHR_parallel_shader_compile */
+
#ifndef GL_KHR_robust_buffer_access_behavior
#define GL_KHR_robust_buffer_access_behavior 1
#endif /* GL_KHR_robust_buffer_access_behavior */
diff --git a/api/GL/glext.h b/api/GL/glext.h
index 1bf85b5..3a22d63 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -51,7 +51,7 @@ extern "C" {
#define GLAPI extern
#endif
-#define GL_GLEXT_VERSION 20170730
+#define GL_GLEXT_VERSION 20170808
/* Generated C header for:
* API: gl
@@ -4990,6 +4990,16 @@ GLAPI void APIENTRY glBlendBarrierKHR (void);
#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008
#endif /* GL_KHR_no_error */
+#ifndef GL_KHR_parallel_shader_compile
+#define GL_KHR_parallel_shader_compile 1
+#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
+#define GL_COMPLETION_STATUS_KHR 0x91B1
+typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
+#endif
+#endif /* GL_KHR_parallel_shader_compile */
+
#ifndef GL_KHR_robust_buffer_access_behavior
#define GL_KHR_robust_buffer_access_behavior 1
#endif /* GL_KHR_robust_buffer_access_behavior */
diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index e4705bb..3908641 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@ extern "C" {
#include <GLES/glplatform.h>
-/* Generated on date 20170730 */
+/* Generated on date 20170808 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index 1469200..75ae018 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@ extern "C" {
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20170730 */
+/* Generated on date 20170808 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index 0de7f8f..cd32b5b 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@ extern "C" {
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20170730 */
+/* Generated on date 20170808 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index cc90a6c..e3c452b 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@ extern "C" {
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20170804 */
+/* Generated on date 20170808 */
/* Generated C header for:
* API: gles2
@@ -159,6 +159,16 @@ GL_APICALL void GL_APIENTRY glGetPointervKHR (GLenum pname, void **params);
#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008
#endif /* GL_KHR_no_error */
+#ifndef GL_KHR_parallel_shader_compile
+#define GL_KHR_parallel_shader_compile 1
+#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
+#define GL_COMPLETION_STATUS_KHR 0x91B1
+typedef void (GL_APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
+#endif
+#endif /* GL_KHR_parallel_shader_compile */
+
#ifndef GL_KHR_robust_buffer_access_behavior
#define GL_KHR_robust_buffer_access_behavior 1
#endif /* GL_KHR_robust_buffer_access_behavior */
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index 2bd6fb4..51c949f 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@ extern "C" {
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20170730 */
+/* Generated on date 20170808 */
/* Generated C header for:
* API: gles2
diff --git a/xml/gl.xml b/xml/gl.xml
index 7b13ff9..01196eb 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -8187,8 +8187,10 @@ typedef unsigned int GLhandleARB;
<unused start="0x91AB" end="0x91AD" vendor="AMD"/>
<enum value="0x91AE" name="GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD"/>
<enum value="0x91AF" name="GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD"/>
- <enum value="0x91B0" name="GL_MAX_SHADER_COMPILER_THREADS_ARB"/>
- <enum value="0x91B1" name="GL_COMPLETION_STATUS_ARB"/>
+ <enum value="0x91B0" name="GL_MAX_SHADER_COMPILER_THREADS_KHR"/>
+ <enum value="0x91B0" name="GL_MAX_SHADER_COMPILER_THREADS_ARB" alias="GL_MAX_SHADER_COMPILER_THREADS_KHR"/>
+ <enum value="0x91B1" name="GL_COMPLETION_STATUS_KHR"/>
+ <enum value="0x91B1" name="GL_COMPLETION_STATUS_ARB" alias="GL_COMPLETION_STATUS_KHR"/>
<unused start="0x91B2" end="0x91B8" vendor="AMD"/>
<enum value="0x91B9" name="GL_COMPUTE_SHADER"/>
<unused start="0x91BA" vendor="AMD"/>
@@ -19341,8 +19343,13 @@ typedef unsigned int GLhandleARB;
<param><ptype>GLfloat</ptype> <name>z</name></param>
</command>
<command>
+ <proto>void <name>glMaxShaderCompilerThreadsKHR</name></proto>
+ <param><ptype>GLuint</ptype> <name>count</name></param>
+ </command>
+ <command>
<proto>void <name>glMaxShaderCompilerThreadsARB</name></proto>
<param><ptype>GLuint</ptype> <name>count</name></param>
+ <alias name="glMaxShaderCompilerThreadsKHR"/>
</command>
<command>
<proto>void <name>glMemoryBarrier</name></proto>
@@ -44354,6 +44361,13 @@ typedef unsigned int GLhandleARB;
</require>
</extension>
<extension name="GL_KHR_texture_compression_astc_sliced_3d" supported="gl|glcore|gles2"/>
+ <extension name="GL_KHR_parallel_shader_compile" supported="gl|glcore|gles2">
+ <require>
+ <enum name="GL_MAX_SHADER_COMPILER_THREADS_KHR"/>
+ <enum name="GL_COMPLETION_STATUS_KHR"/>
+ <command name="glMaxShaderCompilerThreadsKHR"/>
+ </require>
+ </extension>
<extension name="GL_MESAX_texture_stack" supported="gl">
<require>
<enum name="GL_TEXTURE_1D_STACK_MESAX"/>