From 2e059e8f9d156df5e485136a9f2a196d161f90e7 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 22 Mar 2018 04:48:47 +0000 Subject: [PATCH] Update glad to 0.1.18a0 git-svn-id: https://svn.eduke32.com/eduke32@6780 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/glad/include/KHR/khrplatform.h | 16 +++++++--------- source/glad/include/glad/glad.h | 4 ++-- source/glad/include/glad/glad_wgl.h | 2 +- source/glad/src/glad.c | 10 +++++----- source/glad/src/glad_wgl.c | 8 ++++---- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/source/glad/include/KHR/khrplatform.h b/source/glad/include/KHR/khrplatform.h index 1ad3554a7..975bbffed 100644 --- a/source/glad/include/KHR/khrplatform.h +++ b/source/glad/include/KHR/khrplatform.h @@ -2,7 +2,7 @@ #define __khrplatform_h_ /* -** Copyright (c) 2008-2009 The Khronos Group Inc. +** Copyright (c) 2008-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -26,18 +26,16 @@ /* Khronos platform-specific types and definitions. * - * $Revision: 32517 $ on $Date: 2016-03-11 02:41:19 -0800 (Fri, 11 Mar 2016) $ + * The master copy of khrplatform.h is maintained in the Khronos EGL + * Registry repository at https://github.com/KhronosGroup/EGL-Registry + * The last semantic modification to khrplatform.h was at commit ID: + * 67a3e0864c2d75ea5287b9f3d2eb74a745936692 * * Adopters may modify this file to suit their platform. Adopters are * encouraged to submit platform specific modifications to the Khronos * group so that they can be included in future versions of this file. - * Please submit changes by sending them to the public Khronos Bugzilla - * (http://khronos.org/bugzilla) by filing a bug against product - * "Khronos (general)" component "Registry". - * - * A predefined template which fills in some of the bug fields can be - * reached using http://tinyurl.com/khrplatform-h-bugreport, but you - * must create a Bugzilla login first. + * Please submit changes by filing pull requests or issues on + * the EGL Registry repository linked above. * * * See the Implementer's Guidelines for information about where this file diff --git a/source/glad/include/glad/glad.h b/source/glad/include/glad/glad.h index 46f5a6868..f2858a957 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 Wed Feb 14 18:43:02 2018. + OpenGL, OpenGL ES loader generated by glad 0.1.18a0 on Thu Mar 22 01:10:42 2018. Language/Generator: C/C++ Specification: gl @@ -1251,7 +1251,7 @@ GLAPI PFNGLGETTEXLEVELPARAMETERIVPROC glad_glGetTexLevelParameteriv; typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC)(GLenum cap); GLAPI PFNGLISENABLEDPROC glad_glIsEnabled; #define glIsEnabled glad_glIsEnabled -typedef void (APIENTRYP PFNGLDEPTHRANGEPROC)(GLdouble near, GLdouble far); +typedef void (APIENTRYP PFNGLDEPTHRANGEPROC)(GLdouble n, GLdouble f); GLAPI PFNGLDEPTHRANGEPROC glad_glDepthRange; #define glDepthRange glad_glDepthRange typedef void (APIENTRYP PFNGLVIEWPORTPROC)(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/source/glad/include/glad/glad_wgl.h b/source/glad/include/glad/glad_wgl.h index 88501caca..368115802 100644 --- a/source/glad/include/glad/glad_wgl.h +++ b/source/glad/include/glad/glad_wgl.h @@ -1,6 +1,6 @@ /* - WGL loader generated by glad 0.1.16a0 on Sat Jan 27 08:40:53 2018. + WGL loader generated by glad 0.1.18a0 on Thu Mar 22 01:11:56 2018. Language/Generator: C/C++ Specification: wgl diff --git a/source/glad/src/glad.c b/source/glad/src/glad.c index 1bfadee13..9ab66ace1 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 Wed Feb 14 18:43:02 2018. + OpenGL, OpenGL ES loader generated by glad 0.1.18a0 on Thu Mar 22 01:10:42 2018. Language/Generator: C/C++ Specification: gl @@ -59,8 +59,8 @@ int open_gl(void) { static void close_gl(void) { if(libGL != NULL) { - FreeLibrary(libGL); - libGL = NULL; + FreeLibrary((HMODULE) libGL); + libGL = NULL; } } #else @@ -124,7 +124,7 @@ void* get_proc(const char *namez) { #endif if(result == NULL) { #ifdef _WIN32 - result = (void*)GetProcAddress(libGL, namez); + result = (void*)GetProcAddress((HMODULE) libGL, namez); #else result = dlsym(libGL, namez); #endif @@ -180,7 +180,7 @@ static int get_exts(void) { const char *gl_str_tmp = (const char*)glGetStringi(GL_EXTENSIONS, index); size_t len = strlen(gl_str_tmp); - char *local_str = (char*)malloc((len+1) * sizeof(*exts_i)); + char *local_str = (char*)malloc((len+1) * sizeof(char)); if(local_str != NULL) { #if _MSC_VER >= 1400 strncpy_s(local_str, len+1, gl_str_tmp, len); diff --git a/source/glad/src/glad_wgl.c b/source/glad/src/glad_wgl.c index 4ea2ea276..91e2b95ea 100644 --- a/source/glad/src/glad_wgl.c +++ b/source/glad/src/glad_wgl.c @@ -1,6 +1,6 @@ /* - WGL loader generated by glad 0.1.16a0 on Sat Jan 27 08:40:53 2018. + WGL loader generated by glad 0.1.18a0 on Thu Mar 22 01:11:56 2018. Language/Generator: C/C++ Specification: wgl @@ -52,8 +52,8 @@ int open_gl(void) { static void close_gl(void) { if(libGL != NULL) { - FreeLibrary(libGL); - libGL = NULL; + FreeLibrary((HMODULE) libGL); + libGL = NULL; } } #else @@ -117,7 +117,7 @@ void* get_proc(const char *namez) { #endif if(result == NULL) { #ifdef _WIN32 - result = (void*)GetProcAddress(libGL, namez); + result = (void*)GetProcAddress((HMODULE) libGL, namez); #else result = dlsym(libGL, namez); #endif