diff --git a/source/glad/README.TXT b/source/glad/README.TXT index c29a8fcc4..8487f0edf 100644 --- a/source/glad/README.TXT +++ b/source/glad/README.TXT @@ -1,3 +1,3 @@ Generated with GLAD (GL/GLES/EGL/GLX/WGL Loader-Generator): -GL: http://glad.dav1d.de/#profile=compatibility&api=gl%3D2.0&api=gles1%3D1.0&api=gles2%3D2.0&api=glsc2%3Dnone&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_debug_output&extensions=GL_ARB_map_buffer_range&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&language=c&specification=gl&loader=on +GL: http://glad.dav1d.de/#profile=compatibility&api=gl%3D2.0&api=gles1%3D1.0&api=gles2%3D2.0&api=glsc2%3Dnone&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_debug_output&extensions=GL_ARB_map_buffer_range&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&language=c&specification=gl&loader=on WGL: http://glad.dav1d.de/#specification=wgl&api=wgl%3D1.0&extensions=WGL_ARB_create_context&extensions=WGL_ARB_create_context_profile&extensions=WGL_ARB_extensions_string&extensions=WGL_ARB_pixel_format&extensions=WGL_EXT_extensions_string&extensions=WGL_EXT_swap_control&language=c&loader=on diff --git a/source/glad/include/glad/glad.h b/source/glad/include/glad/glad.h index c9372eae0..46f5a6868 100644 --- a/source/glad/include/glad/glad.h +++ b/source/glad/include/glad/glad.h @@ -1,6 +1,6 @@ /* - OpenGL, OpenGL ES loader generated by glad 0.1.16a0 on Sat Jan 27 02:35:01 2018. + OpenGL, OpenGL ES loader generated by glad 0.1.16a0 on Wed Feb 14 18:43:02 2018. Language/Generator: C/C++ Specification: gl @@ -10,6 +10,7 @@ GL_ARB_buffer_storage, GL_ARB_debug_output, GL_ARB_map_buffer_range, + GL_ARB_sync, GL_ARB_texture_rectangle, GL_EXT_fog_coord, GL_EXT_framebuffer_object, @@ -24,9 +25,9 @@ Omit khrplatform: 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_debug_output,GL_ARB_map_buffer_range,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_debug_output,GL_ARB_map_buffer_range,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" Online: - http://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_debug_output&extensions=GL_ARB_map_buffer_range&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 + http://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_debug_output&extensions=GL_ARB_map_buffer_range&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 */ @@ -3004,6 +3005,21 @@ GLAPI PFNGLTRANSLATEXPROC glad_glTranslatex; #define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 #define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 #define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 +#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 +#define GL_OBJECT_TYPE 0x9112 +#define GL_SYNC_CONDITION 0x9113 +#define GL_SYNC_STATUS 0x9114 +#define GL_SYNC_FLAGS 0x9115 +#define GL_SYNC_FENCE 0x9116 +#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 +#define GL_UNSIGNALED 0x9118 +#define GL_SIGNALED 0x9119 +#define GL_ALREADY_SIGNALED 0x911A +#define GL_TIMEOUT_EXPIRED 0x911B +#define GL_CONDITION_SATISFIED 0x911C +#define GL_WAIT_FAILED 0x911D +#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 +#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFF #define GL_TEXTURE_RECTANGLE_ARB 0x84F5 #define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 #define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 @@ -3115,6 +3131,31 @@ typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC)(GLenum target, GLintptr GLAPI PFNGLFLUSHMAPPEDBUFFERRANGEPROC glad_glFlushMappedBufferRange; #define glFlushMappedBufferRange glad_glFlushMappedBufferRange #endif +#ifndef GL_ARB_sync +#define GL_ARB_sync 1 +GLAPI int GLAD_GL_ARB_sync; +typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC)(GLenum condition, GLbitfield flags); +GLAPI PFNGLFENCESYNCPROC glad_glFenceSync; +#define glFenceSync glad_glFenceSync +typedef GLboolean (APIENTRYP PFNGLISSYNCPROC)(GLsync sync); +GLAPI PFNGLISSYNCPROC glad_glIsSync; +#define glIsSync glad_glIsSync +typedef void (APIENTRYP PFNGLDELETESYNCPROC)(GLsync sync); +GLAPI PFNGLDELETESYNCPROC glad_glDeleteSync; +#define glDeleteSync glad_glDeleteSync +typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout); +GLAPI PFNGLCLIENTWAITSYNCPROC glad_glClientWaitSync; +#define glClientWaitSync glad_glClientWaitSync +typedef void (APIENTRYP PFNGLWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout); +GLAPI PFNGLWAITSYNCPROC glad_glWaitSync; +#define glWaitSync 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); +GLAPI PFNGLGETSYNCIVPROC glad_glGetSynciv; +#define glGetSynciv glad_glGetSynciv +#endif #ifndef GL_ARB_texture_rectangle #define GL_ARB_texture_rectangle 1 GLAPI int GLAD_GL_ARB_texture_rectangle; diff --git a/source/glad/src/glad.c b/source/glad/src/glad.c index 262fb761f..1bfadee13 100644 --- a/source/glad/src/glad.c +++ b/source/glad/src/glad.c @@ -1,6 +1,6 @@ /* - OpenGL, OpenGL ES loader generated by glad 0.1.16a0 on Sat Jan 27 02:35:01 2018. + OpenGL, OpenGL ES loader generated by glad 0.1.16a0 on Wed Feb 14 18:43:02 2018. Language/Generator: C/C++ Specification: gl @@ -10,6 +10,7 @@ GL_ARB_buffer_storage, GL_ARB_debug_output, GL_ARB_map_buffer_range, + GL_ARB_sync, GL_ARB_texture_rectangle, GL_EXT_fog_coord, GL_EXT_framebuffer_object, @@ -24,9 +25,9 @@ Omit khrplatform: 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_debug_output,GL_ARB_map_buffer_range,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_debug_output,GL_ARB_map_buffer_range,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" Online: - http://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_debug_output&extensions=GL_ARB_map_buffer_range&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 + http://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_debug_output&extensions=GL_ARB_map_buffer_range&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 */ #include @@ -866,7 +867,7 @@ PFNGLFRONTFACEPROC glad_glFrontFace; int GLAD_GL_EXT_framebuffer_object; int GLAD_GL_ARB_texture_rectangle; int GLAD_GL_SGIS_fog_function; -int GLAD_GL_EXT_fog_coord; +int GLAD_GL_ARB_sync; int GLAD_GL_SGIX_fog_offset; int GLAD_GL_EXT_texture_filter_anisotropic; int GLAD_GL_NV_multisample_filter_hint; @@ -875,6 +876,7 @@ int GLAD_GL_ARB_map_buffer_range; int GLAD_GL_NV_fog_distance; int GLAD_GL_EXT_texture_compression_s3tc; int GLAD_GL_ARB_debug_output; +int GLAD_GL_EXT_fog_coord; PFNGLBUFFERSTORAGEPROC glad_glBufferStorage; PFNGLDEBUGMESSAGECONTROLARBPROC glad_glDebugMessageControlARB; PFNGLDEBUGMESSAGEINSERTARBPROC glad_glDebugMessageInsertARB; @@ -882,6 +884,13 @@ PFNGLDEBUGMESSAGECALLBACKARBPROC glad_glDebugMessageCallbackARB; PFNGLGETDEBUGMESSAGELOGARBPROC glad_glGetDebugMessageLogARB; PFNGLMAPBUFFERRANGEPROC glad_glMapBufferRange; PFNGLFLUSHMAPPEDBUFFERRANGEPROC glad_glFlushMappedBufferRange; +PFNGLFENCESYNCPROC glad_glFenceSync; +PFNGLISSYNCPROC glad_glIsSync; +PFNGLDELETESYNCPROC glad_glDeleteSync; +PFNGLCLIENTWAITSYNCPROC glad_glClientWaitSync; +PFNGLWAITSYNCPROC glad_glWaitSync; +PFNGLGETINTEGER64VPROC glad_glGetInteger64v; +PFNGLGETSYNCIVPROC glad_glGetSynciv; PFNGLFOGCOORDFEXTPROC glad_glFogCoordfEXT; PFNGLFOGCOORDFVEXTPROC glad_glFogCoordfvEXT; PFNGLFOGCOORDDEXTPROC glad_glFogCoorddEXT; @@ -1488,6 +1497,16 @@ static void load_GL_ARB_map_buffer_range(GLADloadproc load) { glad_glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)load("glMapBufferRange"); glad_glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)load("glFlushMappedBufferRange"); } +static void load_GL_ARB_sync(GLADloadproc load) { + if(!GLAD_GL_ARB_sync) return; + glad_glFenceSync = (PFNGLFENCESYNCPROC)load("glFenceSync"); + glad_glIsSync = (PFNGLISSYNCPROC)load("glIsSync"); + glad_glDeleteSync = (PFNGLDELETESYNCPROC)load("glDeleteSync"); + glad_glClientWaitSync = (PFNGLCLIENTWAITSYNCPROC)load("glClientWaitSync"); + glad_glWaitSync = (PFNGLWAITSYNCPROC)load("glWaitSync"); + glad_glGetInteger64v = (PFNGLGETINTEGER64VPROC)load("glGetInteger64v"); + glad_glGetSynciv = (PFNGLGETSYNCIVPROC)load("glGetSynciv"); +} static void load_GL_EXT_fog_coord(GLADloadproc load) { if(!GLAD_GL_EXT_fog_coord) return; glad_glFogCoordfEXT = (PFNGLFOGCOORDFEXTPROC)load("glFogCoordfEXT"); @@ -1526,6 +1545,7 @@ static int find_extensionsGL(void) { GLAD_GL_ARB_buffer_storage = has_ext("GL_ARB_buffer_storage"); GLAD_GL_ARB_debug_output = has_ext("GL_ARB_debug_output"); GLAD_GL_ARB_map_buffer_range = has_ext("GL_ARB_map_buffer_range"); + GLAD_GL_ARB_sync = has_ext("GL_ARB_sync"); GLAD_GL_ARB_texture_rectangle = has_ext("GL_ARB_texture_rectangle"); GLAD_GL_EXT_fog_coord = has_ext("GL_EXT_fog_coord"); GLAD_GL_EXT_framebuffer_object = has_ext("GL_EXT_framebuffer_object"); @@ -1606,6 +1626,7 @@ int gladLoadGLLoader(GLADloadproc load) { load_GL_ARB_buffer_storage(load); load_GL_ARB_debug_output(load); load_GL_ARB_map_buffer_range(load); + load_GL_ARB_sync(load); load_GL_EXT_fog_coord(load); load_GL_EXT_framebuffer_object(load); load_GL_SGIS_fog_function(load);