Commit 494a1357 authored by Richard Gobeille's avatar Richard Gobeille

glad: add GL_ARB_timer_query

parent 694f5c84
......@@ -119,7 +119,7 @@
* This follows the return type of the function and precedes the function
* name in the function prototype.
*/
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(KHRONOS_STATIC)
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
/* Win32 but not WinCE */
# define KHRONOS_APIENTRY __stdcall
#else
......
/*
OpenGL, OpenGL ES loader generated by glad 0.1.30 on Thu Jul 4 02:00:01 2019.
OpenGL, OpenGL ES loader generated by glad 0.1.33 on Mon Jun 22 12:21:29 2020.
Language/Generator: C/C++
Specification: gl
......@@ -15,6 +15,7 @@
GL_ARB_shader_texture_lod,
GL_ARB_sync,
GL_ARB_texture_rectangle,
GL_ARB_timer_query,
GL_EXT_fog_coord,
GL_EXT_framebuffer_object,
GL_EXT_texture_compression_s3tc,
......@@ -29,9 +30,9 @@
Reproducible: False
Commandline:
--profile="compatibility" --api="gl=2.0,gles2=2.0,gles1=1.0" --generator="c" --spec="gl" --extensions="GL_ARB_buffer_storage,GL_ARB_clip_control,GL_ARB_debug_output,GL_ARB_depth_clamp,GL_ARB_map_buffer_range,GL_ARB_shader_texture_lod,GL_ARB_sync,GL_ARB_texture_rectangle,GL_EXT_fog_coord,GL_EXT_framebuffer_object,GL_EXT_texture_compression_s3tc,GL_EXT_texture_filter_anisotropic,GL_NV_fog_distance,GL_NV_multisample_filter_hint,GL_SGIS_fog_function,GL_SGIX_fog_offset"
--profile="compatibility" --api="gl=2.0,gles2=2.0,gles1=1.0" --generator="c" --spec="gl" --extensions="GL_ARB_buffer_storage,GL_ARB_clip_control,GL_ARB_debug_output,GL_ARB_depth_clamp,GL_ARB_map_buffer_range,GL_ARB_shader_texture_lod,GL_ARB_sync,GL_ARB_texture_rectangle,GL_ARB_timer_query,GL_EXT_fog_coord,GL_EXT_framebuffer_object,GL_EXT_texture_compression_s3tc,GL_EXT_texture_filter_anisotropic,GL_NV_fog_distance,GL_NV_multisample_filter_hint,GL_SGIS_fog_function,GL_SGIX_fog_offset"
Online:
https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D2.0&api=gles2%3D2.0&api=gles1%3D1.0&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_clip_control&extensions=GL_ARB_debug_output&extensions=GL_ARB_depth_clamp&extensions=GL_ARB_map_buffer_range&extensions=GL_ARB_shader_texture_lod&extensions=GL_ARB_sync&extensions=GL_ARB_texture_rectangle&extensions=GL_EXT_fog_coord&extensions=GL_EXT_framebuffer_object&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_EXT_texture_filter_anisotropic&extensions=GL_NV_fog_distance&extensions=GL_NV_multisample_filter_hint&extensions=GL_SGIS_fog_function&extensions=GL_SGIX_fog_offset
https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D2.0&api=gles2%3D2.0&api=gles1%3D1.0&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_clip_control&extensions=GL_ARB_debug_output&extensions=GL_ARB_depth_clamp&extensions=GL_ARB_map_buffer_range&extensions=GL_ARB_shader_texture_lod&extensions=GL_ARB_sync&extensions=GL_ARB_texture_rectangle&extensions=GL_ARB_timer_query&extensions=GL_EXT_fog_coord&extensions=GL_EXT_framebuffer_object&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_EXT_texture_filter_anisotropic&extensions=GL_NV_fog_distance&extensions=GL_NV_multisample_filter_hint&extensions=GL_SGIS_fog_function&extensions=GL_SGIX_fog_offset
*/
......@@ -2977,6 +2978,8 @@ GLAPI PFNGLTRANSLATEXPROC glad_glTranslatex;
#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6
#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7
#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
#define GL_TIME_ELAPSED 0x88BF
#define GL_TIMESTAMP 0x8E28
#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450
#define GL_FOG_COORDINATE_EXT 0x8451
#define GL_FRAGMENT_DEPTH_EXT 0x8452
......@@ -3120,7 +3123,7 @@ GLAPI PFNGLWAITSYNCPROC glad_glWaitSync;
typedef void (APIENTRYP PFNGLGETINTEGER64VPROC)(GLenum pname, GLint64 *data);
GLAPI PFNGLGETINTEGER64VPROC glad_glGetInteger64v;
#define glGetInteger64v glad_glGetInteger64v
typedef void (APIENTRYP PFNGLGETSYNCIVPROC)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
typedef void (APIENTRYP PFNGLGETSYNCIVPROC)(GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values);
GLAPI PFNGLGETSYNCIVPROC glad_glGetSynciv;
#define glGetSynciv glad_glGetSynciv
#endif
......@@ -3128,6 +3131,19 @@ GLAPI PFNGLGETSYNCIVPROC glad_glGetSynciv;
#define GL_ARB_texture_rectangle 1
GLAPI int GLAD_GL_ARB_texture_rectangle;
#endif
#ifndef GL_ARB_timer_query
#define GL_ARB_timer_query 1
GLAPI int GLAD_GL_ARB_timer_query;
typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC)(GLuint id, GLenum target);
GLAPI PFNGLQUERYCOUNTERPROC glad_glQueryCounter;
#define glQueryCounter glad_glQueryCounter
typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC)(GLuint id, GLenum pname, GLint64 *params);
GLAPI PFNGLGETQUERYOBJECTI64VPROC glad_glGetQueryObjecti64v;
#define glGetQueryObjecti64v glad_glGetQueryObjecti64v
typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC)(GLuint id, GLenum pname, GLuint64 *params);
GLAPI PFNGLGETQUERYOBJECTUI64VPROC glad_glGetQueryObjectui64v;
#define glGetQueryObjectui64v glad_glGetQueryObjectui64v
#endif
#ifndef GL_EXT_fog_coord
#define GL_EXT_fog_coord 1
GLAPI int GLAD_GL_EXT_fog_coord;
......
/*
WGL loader generated by glad 0.1.30 on Thu Jul 4 02:04:37 2019.
WGL loader generated by glad 0.1.33 on Wed Jun 24 02:32:00 2020.
Language/Generator: C/C++
Specification: wgl
......
/*
OpenGL, OpenGL ES loader generated by glad 0.1.30 on Thu Jul 4 02:00:01 2019.
OpenGL, OpenGL ES loader generated by glad 0.1.33 on Mon Jun 22 12:21:29 2020.
Language/Generator: C/C++
Specification: gl
......@@ -15,6 +15,7 @@
GL_ARB_shader_texture_lod,
GL_ARB_sync,
GL_ARB_texture_rectangle,
GL_ARB_timer_query,
GL_EXT_fog_coord,
GL_EXT_framebuffer_object,
GL_EXT_texture_compression_s3tc,
......@@ -29,9 +30,9 @@
Reproducible: False
Commandline:
--profile="compatibility" --api="gl=2.0,gles2=2.0,gles1=1.0" --generator="c" --spec="gl" --extensions="GL_ARB_buffer_storage,GL_ARB_clip_control,GL_ARB_debug_output,GL_ARB_depth_clamp,GL_ARB_map_buffer_range,GL_ARB_shader_texture_lod,GL_ARB_sync,GL_ARB_texture_rectangle,GL_EXT_fog_coord,GL_EXT_framebuffer_object,GL_EXT_texture_compression_s3tc,GL_EXT_texture_filter_anisotropic,GL_NV_fog_distance,GL_NV_multisample_filter_hint,GL_SGIS_fog_function,GL_SGIX_fog_offset"
--profile="compatibility" --api="gl=2.0,gles2=2.0,gles1=1.0" --generator="c" --spec="gl" --extensions="GL_ARB_buffer_storage,GL_ARB_clip_control,GL_ARB_debug_output,GL_ARB_depth_clamp,GL_ARB_map_buffer_range,GL_ARB_shader_texture_lod,GL_ARB_sync,GL_ARB_texture_rectangle,GL_ARB_timer_query,GL_EXT_fog_coord,GL_EXT_framebuffer_object,GL_EXT_texture_compression_s3tc,GL_EXT_texture_filter_anisotropic,GL_NV_fog_distance,GL_NV_multisample_filter_hint,GL_SGIS_fog_function,GL_SGIX_fog_offset"
Online:
https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D2.0&api=gles2%3D2.0&api=gles1%3D1.0&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_clip_control&extensions=GL_ARB_debug_output&extensions=GL_ARB_depth_clamp&extensions=GL_ARB_map_buffer_range&extensions=GL_ARB_shader_texture_lod&extensions=GL_ARB_sync&extensions=GL_ARB_texture_rectangle&extensions=GL_EXT_fog_coord&extensions=GL_EXT_framebuffer_object&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_EXT_texture_filter_anisotropic&extensions=GL_NV_fog_distance&extensions=GL_NV_multisample_filter_hint&extensions=GL_SGIS_fog_function&extensions=GL_SGIX_fog_offset
https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D2.0&api=gles2%3D2.0&api=gles1%3D1.0&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_clip_control&extensions=GL_ARB_debug_output&extensions=GL_ARB_depth_clamp&extensions=GL_ARB_map_buffer_range&extensions=GL_ARB_shader_texture_lod&extensions=GL_ARB_sync&extensions=GL_ARB_texture_rectangle&extensions=GL_ARB_timer_query&extensions=GL_EXT_fog_coord&extensions=GL_EXT_framebuffer_object&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_EXT_texture_filter_anisotropic&extensions=GL_NV_fog_distance&extensions=GL_NV_multisample_filter_hint&extensions=GL_SGIS_fog_function&extensions=GL_SGIX_fog_offset
*/
#include <stdio.h>
......@@ -42,6 +43,9 @@
static void* get_proc(const char *namez);
#if defined(_WIN32) || defined(__CYGWIN__)
#ifndef _WINDOWS_
#undef APIENTRY
#endif
#include <windows.h>
static HMODULE libGL;
......@@ -892,6 +896,7 @@ int GLAD_GL_ARB_map_buffer_range = 0;
int GLAD_GL_ARB_shader_texture_lod = 0;
int GLAD_GL_ARB_sync = 0;
int GLAD_GL_ARB_texture_rectangle = 0;
int GLAD_GL_ARB_timer_query = 0;
int GLAD_GL_EXT_fog_coord = 0;
int GLAD_GL_EXT_framebuffer_object = 0;
int GLAD_GL_EXT_texture_compression_s3tc = 0;
......@@ -915,6 +920,9 @@ PFNGLCLIENTWAITSYNCPROC glad_glClientWaitSync = NULL;
PFNGLWAITSYNCPROC glad_glWaitSync = NULL;
PFNGLGETINTEGER64VPROC glad_glGetInteger64v = NULL;
PFNGLGETSYNCIVPROC glad_glGetSynciv = NULL;
PFNGLQUERYCOUNTERPROC glad_glQueryCounter = NULL;
PFNGLGETQUERYOBJECTI64VPROC glad_glGetQueryObjecti64v = NULL;
PFNGLGETQUERYOBJECTUI64VPROC glad_glGetQueryObjectui64v = NULL;
PFNGLFOGCOORDFEXTPROC glad_glFogCoordfEXT = NULL;
PFNGLFOGCOORDFVEXTPROC glad_glFogCoordfvEXT = NULL;
PFNGLFOGCOORDDEXTPROC glad_glFogCoorddEXT = NULL;
......@@ -1535,6 +1543,12 @@ static void load_GL_ARB_sync(GLADloadproc load) {
glad_glGetInteger64v = (PFNGLGETINTEGER64VPROC)load("glGetInteger64v");
glad_glGetSynciv = (PFNGLGETSYNCIVPROC)load("glGetSynciv");
}
static void load_GL_ARB_timer_query(GLADloadproc load) {
if(!GLAD_GL_ARB_timer_query) return;
glad_glQueryCounter = (PFNGLQUERYCOUNTERPROC)load("glQueryCounter");
glad_glGetQueryObjecti64v = (PFNGLGETQUERYOBJECTI64VPROC)load("glGetQueryObjecti64v");
glad_glGetQueryObjectui64v = (PFNGLGETQUERYOBJECTUI64VPROC)load("glGetQueryObjectui64v");
}
static void load_GL_EXT_fog_coord(GLADloadproc load) {
if(!GLAD_GL_EXT_fog_coord) return;
glad_glFogCoordfEXT = (PFNGLFOGCOORDFEXTPROC)load("glFogCoordfEXT");
......@@ -1578,6 +1592,7 @@ static int find_extensionsGL(void) {
GLAD_GL_ARB_shader_texture_lod = has_ext("GL_ARB_shader_texture_lod");
GLAD_GL_ARB_sync = has_ext("GL_ARB_sync");
GLAD_GL_ARB_texture_rectangle = has_ext("GL_ARB_texture_rectangle");
GLAD_GL_ARB_timer_query = has_ext("GL_ARB_timer_query");
GLAD_GL_EXT_fog_coord = has_ext("GL_EXT_fog_coord");
GLAD_GL_EXT_framebuffer_object = has_ext("GL_EXT_framebuffer_object");
GLAD_GL_EXT_texture_compression_s3tc = has_ext("GL_EXT_texture_compression_s3tc");
......@@ -1659,6 +1674,7 @@ int gladLoadGLLoader(GLADloadproc load) {
load_GL_ARB_debug_output(load);
load_GL_ARB_map_buffer_range(load);
load_GL_ARB_sync(load);
load_GL_ARB_timer_query(load);
load_GL_EXT_fog_coord(load);
load_GL_EXT_framebuffer_object(load);
load_GL_SGIS_fog_function(load);
......
/*
WGL loader generated by glad 0.1.30 on Thu Jul 4 02:04:37 2019.
WGL loader generated by glad 0.1.33 on Wed Jun 24 02:32:00 2020.
Language/Generator: C/C++
Specification: wgl
......@@ -32,6 +32,9 @@
static void* get_proc(const char *namez);
#if defined(_WIN32) || defined(__CYGWIN__)
#ifndef _WINDOWS_
#undef APIENTRY
#endif
#include <windows.h>
static HMODULE libGL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment