Regenerate headers and fix use of a deprecated python time method
diff --git a/api/GL/glext.h b/api/GL/glext.h index 4f395f6..5493d0b 100644 --- a/api/GL/glext.h +++ b/api/GL/glext.h
@@ -51,7 +51,7 @@ #define GLAPI extern #endif -#define GL_GLEXT_VERSION 20200423 +#define GL_GLEXT_VERSION 20200806 #include <KHR/khrplatform.h>
diff --git a/api/GL/glxext.h b/api/GL/glxext.h index 8dcc87c..8da48ea 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 20200408 +#define GLX_GLXEXT_VERSION 20200806 /* Generated C header for: * API: glx
diff --git a/api/GL/wgl.h b/api/GL/wgl.h index 07b4a8e..e97513b 100644 --- a/api/GL/wgl.h +++ b/api/GL/wgl.h
@@ -39,7 +39,7 @@ #include <windows.h> #endif -/* Generated on date 20200408 */ +/* Generated on date 20200806 */ /* Generated C header for: * API: wgl
diff --git a/api/GL/wglext.h b/api/GL/wglext.h index ac4b86b..649af53 100755 --- a/api/GL/wglext.h +++ b/api/GL/wglext.h
@@ -39,7 +39,7 @@ #include <windows.h> #endif -#define WGL_WGLEXT_VERSION 20200408 +#define WGL_WGLEXT_VERSION 20200806 /* Generated C header for: * API: wgl
diff --git a/api/GLES/gl.h b/api/GLES/gl.h index 914b8e7..09e3c1e 100644 --- a/api/GLES/gl.h +++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@ #include <GLES/glplatform.h> -/* Generated on date 20200423 */ +/* Generated on date 20200806 */ /* Generated C header for: * API: gles1
diff --git a/api/GLES/glext.h b/api/GLES/glext.h index a51277c..25f0f0e 100644 --- a/api/GLES/glext.h +++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@ #define GL_APIENTRYP GL_APIENTRY* #endif -/* Generated on date 20200423 */ +/* Generated on date 20200806 */ /* Generated C header for: * API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h index 00aa7fc..23aeb15 100644 --- a/api/GLES2/gl2.h +++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@ #define GL_GLES_PROTOTYPES 1 #endif -/* Generated on date 20200423 */ +/* Generated on date 20200806 */ /* Generated C header for: * API: gles2
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h index b573a9b..801a9bc 100644 --- a/api/GLES2/gl2ext.h +++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@ #define GL_APIENTRYP GL_APIENTRY* #endif -/* Generated on date 20200423 */ +/* Generated on date 20200806 */ /* Generated C header for: * API: gles2 @@ -1624,6 +1624,10 @@ #endif #endif /* GL_EXT_multisampled_render_to_texture */ +#ifndef GL_EXT_multisampled_render_to_texture2 +#define GL_EXT_multisampled_render_to_texture2 1 +#endif /* GL_EXT_multisampled_render_to_texture2 */ + #ifndef GL_EXT_multiview_draw_buffers #define GL_EXT_multiview_draw_buffers 1 #define GL_COLOR_ATTACHMENT_EXT 0x90F0
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h index d96042b..8ff2c46 100644 --- a/api/GLES3/gl3.h +++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@ #define GL_GLES_PROTOTYPES 1 #endif -/* Generated on date 20200423 */ +/* Generated on date 20200806 */ /* Generated C header for: * API: gles2
diff --git a/xml/genglvnd.py b/xml/genglvnd.py index 5b3ab02..166f38e 100755 --- a/xml/genglvnd.py +++ b/xml/genglvnd.py
@@ -75,10 +75,10 @@ startTime = None def startTimer(): global startTime - startTime = time.clock() + startTime = time.process_time() def endTimer(msg): global startTime - endTime = time.clock() + endTime = time.process_time() if (timeit): write(msg, endTime - startTime) startTime = None
diff --git a/xml/genheaders.py b/xml/genheaders.py index bc60b59..7267ceb 100755 --- a/xml/genheaders.py +++ b/xml/genheaders.py
@@ -41,10 +41,10 @@ startTime = None def startTimer(): global startTime - startTime = time.clock() + startTime = time.process_time() def endTimer(msg): global startTime - endTime = time.clock() + endTime = time.process_time() if (timeit): write(msg, endTime - startTime) startTime = None