Google GitGoogle Git
Sign in
skia/external/github.com/KhronosGroup/OpenGL-Registry/refs/heads/fix-GLVULKANPROCNV^!/.
commit
84d0cb785db0bc094be7aae81942fc47d913b1b7
[log]
author
Piers Daniell <pdaniell@nvidia.com>
Mon Feb 27 13:11:44 2017 -0800
committer
Piers Daniell <pdaniell@nvidia.com>
Mon Feb 27 13:11:44 2017 -0800
tree
a8632adb34c5b6f9022367bb2048ad31b3c29b45
parent
46f224db44dbe2e81511842a03e882d17dcb0ade [diff]
Fix typedef generation of GLVULKANPROCNV

Because of the missing <ptype></ptype> around the new callback type the
typedef definition of this was not generated. Also the old name
"VULKANPROCNV" was in the wrong namespace. Now it's called
"GLVULKANPROCNV".

diff --git a/api/GL/glcorearb.h b/api/GL/glcorearb.h
index af1ea43..7183c33 100755
--- a/api/GL/glcorearb.h
+++ b/api/GL/glcorearb.h

@@ -4515,14 +4515,15 @@
 
 #ifndef GL_NV_draw_vulkan_image
 #define GL_NV_draw_vulkan_image 1
+typedef void (APIENTRY  *GLVULKANPROCNV)(void);
 typedef void (APIENTRYP PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
-typedef VULKANPROCNV (APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name);
+typedef GLVULKANPROCNV (APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name);
 typedef void (APIENTRYP PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
 typedef void (APIENTRYP PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
 typedef void (APIENTRYP PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glDrawVkImageNV (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
-GLAPI VULKANPROCNV APIENTRY glGetVkProcAddrNV (const GLchar *name);
+GLAPI GLVULKANPROCNV APIENTRY glGetVkProcAddrNV (const GLchar *name);
 GLAPI void APIENTRY glWaitVkSemaphoreNV (GLuint64 vkSemaphore);
 GLAPI void APIENTRY glSignalVkSemaphoreNV (GLuint64 vkSemaphore);
 GLAPI void APIENTRY glSignalVkFenceNV (GLuint64 vkFence);

diff --git a/api/GL/glext.h b/api/GL/glext.h
index 4a8db1d..109c382 100755
--- a/api/GL/glext.h
+++ b/api/GL/glext.h

@@ -51,7 +51,7 @@
 #define GLAPI extern
 #endif
 
-#define GL_GLEXT_VERSION 20170222
+#define GL_GLEXT_VERSION 20170227
 
 /* Generated C header for:
  * API: gl
@@ -9371,14 +9371,15 @@
 
 #ifndef GL_NV_draw_vulkan_image
 #define GL_NV_draw_vulkan_image 1
+typedef void (APIENTRY  *GLVULKANPROCNV)(void);
 typedef void (APIENTRYP PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
-typedef VULKANPROCNV (APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name);
+typedef GLVULKANPROCNV (APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name);
 typedef void (APIENTRYP PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
 typedef void (APIENTRYP PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
 typedef void (APIENTRYP PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glDrawVkImageNV (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
-GLAPI VULKANPROCNV APIENTRY glGetVkProcAddrNV (const GLchar *name);
+GLAPI GLVULKANPROCNV APIENTRY glGetVkProcAddrNV (const GLchar *name);
 GLAPI void APIENTRY glWaitVkSemaphoreNV (GLuint64 vkSemaphore);
 GLAPI void APIENTRY glSignalVkSemaphoreNV (GLuint64 vkSemaphore);
 GLAPI void APIENTRY glSignalVkFenceNV (GLuint64 vkFence);

diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index 9eb7bbe..30ff192 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h

@@ -36,7 +36,7 @@
 
 #include <GLES/glplatform.h>
 
-/* Generated on date 20170222 */
+/* Generated on date 20170227 */
 
 /* Generated C header for:
  * API: gles1

diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index 64f0565..64e2a54 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h

@@ -38,7 +38,7 @@
 #define GL_APIENTRYP GL_APIENTRY*
 #endif
 
-/* Generated on date 20170222 */
+/* Generated on date 20170227 */
 
 /* Generated C header for:
  * API: gles1

diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index 8fa9ebd..578d503 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h

@@ -44,7 +44,7 @@
 #define GL_GLES_PROTOTYPES 1
 #endif
 
-/* Generated on date 20170222 */
+/* Generated on date 20170227 */
 
 /* Generated C header for:
  * API: gles2

diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index fb5d655..fad793c 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h

@@ -38,7 +38,7 @@
 #define GL_APIENTRYP GL_APIENTRY*
 #endif
 
-/* Generated on date 20170222 */
+/* Generated on date 20170227 */
 
 /* Generated C header for:
  * API: gles2
@@ -2376,14 +2376,15 @@
 
 #ifndef GL_NV_draw_vulkan_image
 #define GL_NV_draw_vulkan_image 1
+typedef void (GL_APIENTRY  *GLVULKANPROCNV)(void);
 typedef void (GL_APIENTRYP PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
-typedef VULKANPROCNV (GL_APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name);
+typedef GLVULKANPROCNV (GL_APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name);
 typedef void (GL_APIENTRYP PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
 typedef void (GL_APIENTRYP PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
 typedef void (GL_APIENTRYP PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence);
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glDrawVkImageNV (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
-GL_APICALL VULKANPROCNV GL_APIENTRY glGetVkProcAddrNV (const GLchar *name);
+GL_APICALL GLVULKANPROCNV GL_APIENTRY glGetVkProcAddrNV (const GLchar *name);
 GL_APICALL void GL_APIENTRY glWaitVkSemaphoreNV (GLuint64 vkSemaphore);
 GL_APICALL void GL_APIENTRY glSignalVkSemaphoreNV (GLuint64 vkSemaphore);
 GL_APICALL void GL_APIENTRY glSignalVkFenceNV (GLuint64 vkFence);

diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index dda9a96..a1631d2 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h

@@ -44,7 +44,7 @@
 #define GL_GLES_PROTOTYPES 1
 #endif
 
-/* Generated on date 20170222 */
+/* Generated on date 20170227 */
 
 /* Generated C header for:
  * API: gles2

diff --git a/xml/gl.xml b/xml/gl.xml
index 5a9af31..60375fe 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml

@@ -142,7 +142,7 @@
         <type>typedef void (<apientry/> *<name>GLDEBUGPROCAMD</name>)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);</type>
         <type>typedef unsigned short <name>GLhalfNV</name>;</type>
         <type requires="GLintptr">typedef GLintptr <name>GLvdpauSurfaceNV</name>;</type>
-        <type>typedef void (<apientry/> *<name>VULKANPROCNV</name>)(void);</type>
+        <type>typedef void (<apientry/> *<name>GLVULKANPROCNV</name>)(void);</type>
     </types>
 
     <!-- SECTION: GL parameter class type definitions. -->
@@ -30161,7 +30161,7 @@
             <param><ptype>GLfloat</ptype> <name>t1</name></param>
         </command>
         <command>
-            <proto>VULKANPROCNV <name>glGetVkProcAddrNV</name></proto>
+            <proto><ptype>GLVULKANPROCNV</ptype> <name>glGetVkProcAddrNV</name></proto>
             <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
         </command>
         <command>