Add xml definitions for gpu_multicast2 extensions
diff --git a/api/GL/glext.h b/api/GL/glext.h
index 2716c43..e035352 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -51,7 +51,7 @@
#define GLAPI extern
#endif
-#define GL_GLEXT_VERSION 20190605
+#define GL_GLEXT_VERSION 20190728
#include <KHR/khrplatform.h>
@@ -9377,6 +9377,25 @@
#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
#endif /* GL_NVX_gpu_memory_info */
+#ifndef GL_NVX_gpu_multicast2
+#define GL_NVX_gpu_multicast2 1
+#define GL_UPLOAD_GPU_MASK_NVX 0x954A
+typedef void (APIENTRYP PFNGLUPLOADGPUMASKNVXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLMULTICASTVIEWPORTARRAYVNVXPROC) (GLuint gpu, GLuint first, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTICASTVIEWPORTPOSITIONWSCALENVXPROC) (GLuint gpu, GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+typedef void (APIENTRYP PFNGLMULTICASTSCISSORARRAYVNVXPROC) (GLuint gpu, GLuint first, GLsizei count, const GLint *v);
+typedef GLuint (APIENTRYP PFNGLASYNCCOPYBUFFERSUBDATANVXPROC) (GLsizei waitSemaphoreCount, const GLuint *waitSemaphoreArray, const GLuint64 *fenceValueArray, GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size, GLsizei signalSemaphoreCount, const GLuint *signalSemaphoreArray, const GLuint64 *signalValueArray);
+typedef GLuint (APIENTRYP PFNGLASYNCCOPYIMAGESUBDATANVXPROC) (GLsizei waitSemaphoreCount, const GLuint *waitSemaphoreArray, const GLuint64 *waitValueArray, GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth, GLsizei signalSemaphoreCount, const GLuint *signalSemaphoreArray, const GLuint64 *signalValueArray);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUploadGpuMaskNVX (GLbitfield mask);
+GLAPI void APIENTRY glMulticastViewportArrayvNVX (GLuint gpu, GLuint first, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glMulticastViewportPositionWScaleNVX (GLuint gpu, GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+GLAPI void APIENTRY glMulticastScissorArrayvNVX (GLuint gpu, GLuint first, GLsizei count, const GLint *v);
+GLAPI GLuint APIENTRY glAsyncCopyBufferSubDataNVX (GLsizei waitSemaphoreCount, const GLuint *waitSemaphoreArray, const GLuint64 *fenceValueArray, GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size, GLsizei signalSemaphoreCount, const GLuint *signalSemaphoreArray, const GLuint64 *signalValueArray);
+GLAPI GLuint APIENTRY glAsyncCopyImageSubDataNVX (GLsizei waitSemaphoreCount, const GLuint *waitSemaphoreArray, const GLuint64 *waitValueArray, GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth, GLsizei signalSemaphoreCount, const GLuint *signalSemaphoreArray, const GLuint64 *signalValueArray);
+#endif
+#endif /* GL_NVX_gpu_multicast2 */
+
#ifndef GL_NVX_linked_gpu_multicast
#define GL_NVX_linked_gpu_multicast 1
#define GL_LGPU_SEPARATE_STORAGE_BIT_NVX 0x0800
@@ -9391,6 +9410,20 @@
#endif
#endif /* GL_NVX_linked_gpu_multicast */
+#ifndef GL_NVX_progress_fence
+#define GL_NVX_progress_fence 1
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRESSFENCENVXPROC) (void);
+typedef void (APIENTRYP PFNGLSIGNALSEMAPHOREUI64NVXPROC) (GLuint signalGpu, GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+typedef void (APIENTRYP PFNGLWAITSEMAPHOREUI64NVXPROC) (GLuint waitGpu, GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+typedef void (APIENTRYP PFNGLCLIENTWAITSEMAPHOREUI64NVXPROC) (GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glCreateProgressFenceNVX (void);
+GLAPI void APIENTRY glSignalSemaphoreui64NVX (GLuint signalGpu, GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+GLAPI void APIENTRY glWaitSemaphoreui64NVX (GLuint waitGpu, GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+GLAPI void APIENTRY glClientWaitSemaphoreui64NVX (GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+#endif
+#endif /* GL_NVX_progress_fence */
+
#ifndef GL_NV_alpha_to_coverage_dither_control
#define GL_NV_alpha_to_coverage_dither_control 1
#define GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV 0x934D
diff --git a/api/GL/glxext.h b/api/GL/glxext.h
index 2f1c717..a6f1c0c 100755
--- a/api/GL/glxext.h
+++ b/api/GL/glxext.h
@@ -34,7 +34,7 @@
** https://github.com/KhronosGroup/OpenGL-Registry
*/
-#define GLX_GLXEXT_VERSION 20190605
+#define GLX_GLXEXT_VERSION 20190728
/* Generated C header for:
* API: glx
diff --git a/api/GL/wgl.h b/api/GL/wgl.h
index f68838c..a586976 100644
--- a/api/GL/wgl.h
+++ b/api/GL/wgl.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-/* Generated on date 20190605 */
+/* Generated on date 20190728 */
/* Generated C header for:
* API: wgl
@@ -806,6 +806,15 @@
#endif
#endif /* WGL_NV_gpu_affinity */
+#ifndef WGL_NV_multigpu_context
+#define WGL_NV_multigpu_context 1
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_NV 0x20AA
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_SINGLE_NV 0x20AB
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_AFR_NV 0x20AC
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_MULTICAST_NV 0x20AD
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_MULTI_DISPLAY_MULTICAST_NV 0x20AE
+#endif /* WGL_NV_multigpu_context */
+
#ifndef WGL_NV_multisample_coverage
#define WGL_NV_multisample_coverage 1
#define WGL_COVERAGE_SAMPLES_NV 0x2042
diff --git a/api/GL/wglext.h b/api/GL/wglext.h
index 657b812..10c3ce1 100755
--- a/api/GL/wglext.h
+++ b/api/GL/wglext.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-#define WGL_WGLEXT_VERSION 20190605
+#define WGL_WGLEXT_VERSION 20190728
/* Generated C header for:
* API: wgl
@@ -715,6 +715,15 @@
#endif
#endif /* WGL_NV_gpu_affinity */
+#ifndef WGL_NV_multigpu_context
+#define WGL_NV_multigpu_context 1
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_NV 0x20AA
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_SINGLE_NV 0x20AB
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_AFR_NV 0x20AC
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_MULTICAST_NV 0x20AD
+#define WGL_CONTEXT_MULTIGPU_ATTRIB_MULTI_DISPLAY_MULTICAST_NV 0x20AE
+#endif /* WGL_NV_multigpu_context */
+
#ifndef WGL_NV_multisample_coverage
#define WGL_NV_multisample_coverage 1
#define WGL_COVERAGE_SAMPLES_NV 0x2042
diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index 3f04299..50b4577 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@
#include <GLES/glplatform.h>
-/* Generated on date 20190605 */
+/* Generated on date 20190728 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index 0ed2713..a79dbd5 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20190605 */
+/* Generated on date 20190728 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index 76fd3c4..a5c6130 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20190605 */
+/* Generated on date 20190728 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index 04e902f..be8a5d5 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20190605 */
+/* Generated on date 20190728 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index 121e9cb..d8f71f3 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20190605 */
+/* Generated on date 20190728 */
/* Generated C header for:
* API: gles2
diff --git a/xml/genheaders.py b/xml/genheaders.py
index 977dac8..bc60b59 100755
--- a/xml/genheaders.py
+++ b/xml/genheaders.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2013-2018 The Khronos Group Inc.
#
diff --git a/xml/gl.xml b/xml/gl.xml
index a0a873e..18d8d2e 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -10914,7 +10914,8 @@
<enum value="0x9547" name="GL_QUERY_RESOURCE_BUFFEROBJECT_NV"/>
<enum value="0x9548" name="GL_PER_GPU_STORAGE_NV"/>
<enum value="0x9549" name="GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV"/>
- <unused start="0x954A" end="0x954C" vendor="NV"/>
+ <enum value="0x954A" name="GL_UPLOAD_GPU_MASK_NVX"/>
+ <unused start="0x954B" end="0x954C" vendor="NV"/>
<enum value="0x954D" name="GL_CONSERVATIVE_RASTER_MODE_NV"/>
<enum value="0x954E" name="GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV"/>
<enum value="0x954F" name="GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV"/>
@@ -11278,6 +11279,48 @@
<param><ptype>GLuint</ptype> <name>offset</name></param>
</command>
<command>
+ <proto><ptype>GLuint</ptype> <name>glAsyncCopyBufferSubDataNVX</name></proto>
+ <param><ptype>GLsizei</ptype> <name>waitSemaphoreCount</name></param>
+ <param len="waitSemaphoreCount">const <ptype>GLuint</ptype> *<name>waitSemaphoreArray</name></param>
+ <param len="waitSemaphoreCount">const <ptype>GLuint64</ptype> *<name>fenceValueArray</name></param>
+ <param><ptype>GLuint</ptype> <name>readGpu</name></param>
+ <param><ptype>GLbitfield</ptype> <name>writeGpuMask</name></param>
+ <param><ptype>GLuint</ptype> <name>readBuffer</name></param>
+ <param><ptype>GLuint</ptype> <name>writeBuffer</name></param>
+ <param><ptype>GLintptr</ptype> <name>readOffset</name></param>
+ <param><ptype>GLintptr</ptype> <name>writeOffset</name></param>
+ <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
+ <param><ptype>GLsizei</ptype> <name>signalSemaphoreCount</name></param>
+ <param len="signalSemaphoreCount">const <ptype>GLuint</ptype> *<name>signalSemaphoreArray</name></param>
+ <param len="signalSemaphoreCount">const <ptype>GLuint64</ptype> *<name>signalValueArray</name></param>
+ </command>
+ <command>
+ <proto><ptype>GLuint</ptype> <name>glAsyncCopyImageSubDataNVX</name></proto>
+ <param><ptype>GLsizei</ptype> <name>waitSemaphoreCount</name></param>
+ <param len="waitSemaphoreCount">const <ptype>GLuint</ptype> *<name>waitSemaphoreArray</name></param>
+ <param len="waitSemaphoreCount">const <ptype>GLuint64</ptype> *<name>waitValueArray</name></param>
+ <param><ptype>GLuint</ptype> <name>srcGpu</name></param>
+ <param><ptype>GLbitfield</ptype> <name>dstGpuMask</name></param>
+ <param><ptype>GLuint</ptype> <name>srcName</name></param>
+ <param><ptype>GLenum</ptype> <name>srcTarget</name></param>
+ <param><ptype>GLint</ptype> <name>srcLevel</name></param>
+ <param><ptype>GLint</ptype> <name>srcX</name></param>
+ <param><ptype>GLint</ptype> <name>srcY</name></param>
+ <param><ptype>GLint</ptype> <name>srcZ</name></param>
+ <param><ptype>GLuint</ptype> <name>dstName</name></param>
+ <param><ptype>GLenum</ptype> <name>dstTarget</name></param>
+ <param><ptype>GLint</ptype> <name>dstLevel</name></param>
+ <param><ptype>GLint</ptype> <name>dstX</name></param>
+ <param><ptype>GLint</ptype> <name>dstY</name></param>
+ <param><ptype>GLint</ptype> <name>dstZ</name></param>
+ <param><ptype>GLsizei</ptype> <name>srcWidth</name></param>
+ <param><ptype>GLsizei</ptype> <name>srcHeight</name></param>
+ <param><ptype>GLsizei</ptype> <name>srcDepth</name></param>
+ <param><ptype>GLsizei</ptype> <name>signalSemaphoreCount</name></param>
+ <param len="signalSemaphoreCount">const <ptype>GLuint</ptype> *<name>signalSemaphoreArray</name></param>
+ <param len="signalSemaphoreCount">const <ptype>GLuint64</ptype> *<name>signalValueArray</name></param>
+ </command>
+ <command>
<proto>void <name>glAsyncMarkerSGIX</name></proto>
<param><ptype>GLuint</ptype> <name>marker</name></param>
</command>
@@ -12542,6 +12585,12 @@
<param group="ClientAttribMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
</command>
<command>
+ <proto>void <name>glClientWaitSemaphoreui64NVX</name></proto>
+ <param><ptype>GLsizei</ptype> <name>fenceObjectCount</name></param>
+ <param len="fenceObjectCount">const <ptype>GLuint</ptype> *<name>semaphoreArray</name></param>
+ <param len="fenceObjectCount">const <ptype>GLuint64</ptype> *<name>fenceValueArray</name></param>
+ </command>
+ <command>
<proto group="SyncStatus"><ptype>GLenum</ptype> <name>glClientWaitSync</name></proto>
<param group="sync"><ptype>GLsync</ptype> <name>sync</name></param>
<param group="SyncObjectMask"><ptype>GLbitfield</ptype> <name>flags</name></param>
@@ -14290,6 +14339,9 @@
<param len="n"><ptype>GLuint</ptype> *<name>pipelines</name></param>
</command>
<command>
+ <proto><ptype>GLuint</ptype> <name>glCreateProgressFenceNVX</name></proto>
+ </command>
+ <command>
<proto>void <name>glCreateQueries</name></proto>
<param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
<param><ptype>GLsizei</ptype> <name>n</name></param>
@@ -23006,6 +23058,27 @@
<param><ptype>GLuint</ptype> *<name>params</name></param>
</command>
<command>
+ <proto>void <name>glMulticastScissorArrayvNVX</name></proto>
+ <param><ptype>GLuint</ptype> <name>gpu</name></param>
+ <param><ptype>GLuint</ptype> <name>first</name></param>
+ <param><ptype>GLsizei</ptype> <name>count</name></param>
+ <param len="COMPSIZE(count)">const <ptype>GLint</ptype> *<name>v</name></param>
+ </command>
+ <command>
+ <proto>void <name>glMulticastViewportArrayvNVX</name></proto>
+ <param><ptype>GLuint</ptype> <name>gpu</name></param>
+ <param><ptype>GLuint</ptype> <name>first</name></param>
+ <param><ptype>GLsizei</ptype> <name>count</name></param>
+ <param len="COMPSIZE(count)">const <ptype>GLfloat</ptype> *<name>v</name></param>
+ </command>
+ <command>
+ <proto>void <name>glMulticastViewportPositionWScaleNVX</name></proto>
+ <param><ptype>GLuint</ptype> <name>gpu</name></param>
+ <param><ptype>GLuint</ptype> <name>index</name></param>
+ <param><ptype>GLfloat</ptype> <name>xcoeff</name></param>
+ <param><ptype>GLfloat</ptype> <name>ycoeff</name></param>
+ </command>
+ <command>
<proto>void <name>glMulticastWaitSyncNV</name></proto>
<param><ptype>GLuint</ptype> <name>signalGpu</name></param>
<param><ptype>GLbitfield</ptype> <name>waitGpuMask</name></param>
@@ -27213,6 +27286,13 @@
<param group="TextureLayout" len="COMPSIZE(numTextureBarriers)">const <ptype>GLenum</ptype> *<name>dstLayouts</name></param>
</command>
<command>
+ <proto>void <name>glSignalSemaphoreui64NVX</name></proto>
+ <param><ptype>GLuint</ptype> <name>signalGpu</name></param>
+ <param><ptype>GLsizei</ptype> <name>fenceObjectCount</name></param>
+ <param len="fenceObjectCount">const <ptype>GLuint</ptype> *<name>semaphoreArray</name></param>
+ <param len="fenceObjectCount">const <ptype>GLuint64</ptype> *<name>fenceValueArray</name></param>
+ </command>
+ <command>
<proto>void <name>glSpecializeShader</name></proto>
<param><ptype>GLuint</ptype> <name>shader</name></param>
<param>const <ptype>GLchar</ptype> *<name>pEntryPoint</name></param>
@@ -30255,6 +30335,10 @@
<param group="PreserveModeATI"><ptype>GLenum</ptype> <name>preserve</name></param>
</command>
<command>
+ <proto>void <name>glUploadGpuMaskNVX</name></proto>
+ <param><ptype>GLbitfield</ptype> <name>mask</name></param>
+ </command>
+ <command>
<proto>void <name>glUseProgram</name></proto>
<param><ptype>GLuint</ptype> <name>program</name></param>
</command>
@@ -32838,6 +32922,13 @@
<param group="TextureLayout" len="COMPSIZE(numTextureBarriers)">const <ptype>GLenum</ptype> *<name>srcLayouts</name></param>
</command>
<command>
+ <proto>void <name>glWaitSemaphoreui64NVX</name></proto>
+ <param><ptype>GLuint</ptype> <name>waitGpu</name></param>
+ <param><ptype>GLsizei</ptype> <name>fenceObjectCount</name></param>
+ <param len="fenceObjectCount">const <ptype>GLuint</ptype> *<name>semaphoreArray</name></param>
+ <param len="fenceObjectCount">const <ptype>GLuint64</ptype> *<name>fenceValueArray</name></param>
+ </command>
+ <command>
<proto>void <name>glWaitSync</name></proto>
<param group="sync"><ptype>GLsync</ptype> <name>sync</name></param>
<param><ptype>GLbitfield</ptype> <name>flags</name></param>
@@ -47826,7 +47917,7 @@
</extension>
<extension name="GL_NVX_gpu_multicast2" supported="gl">
<require>
- <enum name="GL_UPLOAD_GPU_MASK_NV"/>
+ <enum name="GL_UPLOAD_GPU_MASK_NVX"/>
<command name="glUploadGpuMaskNVX"/>
<command name="glMulticastViewportArrayvNVX"/>
<command name="glMulticastViewportPositionWScaleNVX"/>
diff --git a/xml/wgl.xml b/xml/wgl.xml
index 4d94a36..87e8fe2 100644
--- a/xml/wgl.xml
+++ b/xml/wgl.xml
@@ -384,7 +384,12 @@
<enum value="0x20A8" name="WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT"/>
<enum value="0x20A9" name="WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB"/>
<enum value="0x20A9" name="WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT"/>
- <unused start="0x20AA" end="0x20AF"/>
+ <enum value="0x20AA" name="WGL_CONTEXT_MULTIGPU_ATTRIB_NV"/>
+ <enum value="0x20AB" name="WGL_CONTEXT_MULTIGPU_ATTRIB_SINGLE_NV"/>
+ <enum value="0x20AC" name="WGL_CONTEXT_MULTIGPU_ATTRIB_AFR_NV"/>
+ <enum value="0x20AD" name="WGL_CONTEXT_MULTIGPU_ATTRIB_MULTICAST_NV"/>
+ <enum value="0x20AE" name="WGL_CONTEXT_MULTIGPU_ATTRIB_MULTI_DISPLAY_MULTICAST_NV"/>
+ <unused start="0x20AF" end="0x20AF"/>
<enum value="0x20B0" name="WGL_FLOAT_COMPONENTS_NV"/>
<enum value="0x20B1" name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV"/>
<enum value="0x20B2" name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV"/>
