From b76480f9f23228c1ef91a967d4ac8f869dbeebb4 Mon Sep 17 00:00:00 2001 From: bjorn Date: Sat, 22 Jul 2017 03:12:28 -0700 Subject: [PATCH] Add texture compression and filter extensions; --- src/lib/glad/glad.c | 17 +++++++++++------ src/lib/glad/glad.h | 31 +++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/lib/glad/glad.c b/src/lib/glad/glad.c index 015d023b..2832cab1 100644 --- a/src/lib/glad/glad.c +++ b/src/lib/glad/glad.c @@ -1,21 +1,22 @@ /* - OpenGL, OpenGL ES loader generated by glad 0.1.14a0 on Sat Jun 24 04:32:10 2017. + OpenGL, OpenGL ES loader generated by glad 0.1.14a0 on Sat Jul 22 10:22:59 2017. Language/Generator: C/C++ Specification: gl APIs: gl=3.3, gles2=3.0 Profile: core Extensions: - + GL_EXT_texture_compression_s3tc, + GL_EXT_texture_filter_anisotropic Loader: False Local files: False Omit khrplatform: False Commandline: - --profile="core" --api="gl=3.3,gles2=3.0" --generator="c" --spec="gl" --no-loader --extensions="" + --profile="core" --api="gl=3.3,gles2=3.0" --generator="c" --spec="gl" --no-loader --extensions="GL_EXT_texture_compression_s3tc,GL_EXT_texture_filter_anisotropic" Online: - http://glad.dav1d.de/#profile=core&language=c&specification=gl&api=gl%3D3.3&api=gles2%3D3.0 + http://glad.dav1d.de/#profile=core&language=c&specification=gl&api=gl%3D3.3&api=gles2%3D3.0&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_EXT_texture_filter_anisotropic */ #include @@ -518,6 +519,8 @@ PFNGLGETUNIFORMBLOCKINDEXPROC glad_glGetUniformBlockIndex; PFNGLTEXIMAGE2DMULTISAMPLEPROC glad_glTexImage2DMultisample; PFNGLGETACTIVEUNIFORMPROC glad_glGetActiveUniform; PFNGLFRONTFACEPROC glad_glFrontFace; +int GLAD_GL_EXT_texture_compression_s3tc; +int GLAD_GL_EXT_texture_filter_anisotropic; static void load_GL_VERSION_1_0(GLADloadproc load) { if(!GLAD_GL_VERSION_1_0) return; glad_glCullFace = (PFNGLCULLFACEPROC)load("glCullFace"); @@ -933,7 +936,8 @@ static void load_GL_VERSION_3_3(GLADloadproc load) { } static int find_extensionsGL(void) { if (!get_exts()) return 0; - (void)&has_ext; + GLAD_GL_EXT_texture_compression_s3tc = has_ext("GL_EXT_texture_compression_s3tc"); + GLAD_GL_EXT_texture_filter_anisotropic = has_ext("GL_EXT_texture_filter_anisotropic"); free_exts(); return 1; } @@ -1269,7 +1273,8 @@ static void load_GL_ES_VERSION_3_0(GLADloadproc load) { } static int find_extensionsGLES2(void) { if (!get_exts()) return 0; - (void)&has_ext; + GLAD_GL_EXT_texture_compression_s3tc = has_ext("GL_EXT_texture_compression_s3tc"); + GLAD_GL_EXT_texture_filter_anisotropic = has_ext("GL_EXT_texture_filter_anisotropic"); free_exts(); return 1; } diff --git a/src/lib/glad/glad.h b/src/lib/glad/glad.h index b7d1101e..646bd9f8 100644 --- a/src/lib/glad/glad.h +++ b/src/lib/glad/glad.h @@ -1,21 +1,22 @@ /* - OpenGL, OpenGL ES loader generated by glad 0.1.14a0 on Sat Jun 24 04:32:10 2017. + OpenGL, OpenGL ES loader generated by glad 0.1.14a0 on Sat Jul 22 10:22:59 2017. Language/Generator: C/C++ Specification: gl APIs: gl=3.3, gles2=3.0 Profile: core Extensions: - + GL_EXT_texture_compression_s3tc, + GL_EXT_texture_filter_anisotropic Loader: False Local files: False Omit khrplatform: False Commandline: - --profile="core" --api="gl=3.3,gles2=3.0" --generator="c" --spec="gl" --no-loader --extensions="" + --profile="core" --api="gl=3.3,gles2=3.0" --generator="c" --spec="gl" --no-loader --extensions="GL_EXT_texture_compression_s3tc,GL_EXT_texture_filter_anisotropic" Online: - http://glad.dav1d.de/#profile=core&language=c&specification=gl&api=gl%3D3.3&api=gles2%3D3.0 + http://glad.dav1d.de/#profile=core&language=c&specification=gl&api=gl%3D3.3&api=gles2%3D3.0&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_EXT_texture_filter_anisotropic */ @@ -2290,6 +2291,28 @@ typedef void (APIENTRYP PFNGLGETINTERNALFORMATIVPROC)(GLenum target, GLenum inte GLAPI PFNGLGETINTERNALFORMATIVPROC glad_glGetInternalformativ; #define glGetInternalformativ glad_glGetInternalformativ #endif +#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 +#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 +#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 +#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 +#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE +#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF +#ifndef GL_EXT_texture_compression_s3tc +#define GL_EXT_texture_compression_s3tc 1 +GLAPI int GLAD_GL_EXT_texture_compression_s3tc; +#endif +#ifndef GL_EXT_texture_filter_anisotropic +#define GL_EXT_texture_filter_anisotropic 1 +GLAPI int GLAD_GL_EXT_texture_filter_anisotropic; +#endif +#ifndef GL_EXT_texture_compression_s3tc +#define GL_EXT_texture_compression_s3tc 1 +GLAPI int GLAD_GL_EXT_texture_compression_s3tc; +#endif +#ifndef GL_EXT_texture_filter_anisotropic +#define GL_EXT_texture_filter_anisotropic 1 +GLAPI int GLAD_GL_EXT_texture_filter_anisotropic; +#endif #ifdef __cplusplus }