Update GLAD to 0.1.20a0
This commit is contained in:
parent
bf561c4946
commit
9cb468da7f
4 changed files with 33 additions and 16 deletions
2
thirdparty/README.md
vendored
2
thirdparty/README.md
vendored
|
@ -115,7 +115,7 @@ Files extracted from upstream source:
|
||||||
## glad
|
## glad
|
||||||
|
|
||||||
- Upstream: https://github.com/Dav1dde/glad
|
- Upstream: https://github.com/Dav1dde/glad
|
||||||
- Version: 0.1.16a0
|
- Version: 0.1.20a0
|
||||||
- License: MIT
|
- License: MIT
|
||||||
|
|
||||||
The files we package are automatically generated.
|
The files we package are automatically generated.
|
||||||
|
|
16
thirdparty/glad/KHR/khrplatform.h
vendored
16
thirdparty/glad/KHR/khrplatform.h
vendored
|
@ -2,7 +2,7 @@
|
||||||
#define __khrplatform_h_
|
#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
|
** Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
** copy of this software and/or associated documentation files (the
|
** copy of this software and/or associated documentation files (the
|
||||||
|
@ -26,18 +26,16 @@
|
||||||
|
|
||||||
/* Khronos platform-specific types and definitions.
|
/* 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
|
* Adopters may modify this file to suit their platform. Adopters are
|
||||||
* encouraged to submit platform specific modifications to the Khronos
|
* encouraged to submit platform specific modifications to the Khronos
|
||||||
* group so that they can be included in future versions of this file.
|
* group so that they can be included in future versions of this file.
|
||||||
* Please submit changes by sending them to the public Khronos Bugzilla
|
* Please submit changes by filing pull requests or issues on
|
||||||
* (http://khronos.org/bugzilla) by filing a bug against product
|
* the EGL Registry repository linked above.
|
||||||
* "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.
|
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* See the Implementer's Guidelines for information about where this file
|
* See the Implementer's Guidelines for information about where this file
|
||||||
|
|
27
thirdparty/glad/glad.c
vendored
27
thirdparty/glad/glad.c
vendored
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
|
|
||||||
OpenGL loader generated by glad 0.1.18a0 on Mon Mar 5 18:43:52 2018.
|
OpenGL loader generated by glad 0.1.20a0 on Fri May 4 21:44:11 2018.
|
||||||
|
|
||||||
Language/Generator: C/C++
|
Language/Generator: C/C++
|
||||||
Specification: gl
|
Specification: gl
|
||||||
|
@ -27,21 +27,40 @@
|
||||||
|
|
||||||
static void* get_proc(const char *namez);
|
static void* get_proc(const char *namez);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
static HMODULE libGL;
|
static HMODULE libGL;
|
||||||
|
|
||||||
typedef void* (APIENTRYP PFNWGLGETPROCADDRESSPROC_PRIVATE)(const char*);
|
typedef void* (APIENTRYP PFNWGLGETPROCADDRESSPROC_PRIVATE)(const char*);
|
||||||
static PFNWGLGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
|
static PFNWGLGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#ifdef __has_include
|
||||||
|
#if __has_include(<winapifamily.h>)
|
||||||
|
#define HAVE_WINAPIFAMILY 1
|
||||||
|
#endif
|
||||||
|
#elif _MSC_VER >= 1700 && !_USING_V110_SDK71_
|
||||||
|
#define HAVE_WINAPIFAMILY 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_WINAPIFAMILY
|
||||||
|
#include <winapifamily.h>
|
||||||
|
#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
|
||||||
|
#define IS_UWP 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
static
|
static
|
||||||
int open_gl(void) {
|
int open_gl(void) {
|
||||||
|
#ifndef IS_UWP
|
||||||
libGL = LoadLibraryW(L"opengl32.dll");
|
libGL = LoadLibraryW(L"opengl32.dll");
|
||||||
if(libGL != NULL) {
|
if(libGL != NULL) {
|
||||||
gladGetProcAddressPtr = (PFNWGLGETPROCADDRESSPROC_PRIVATE)GetProcAddress(
|
gladGetProcAddressPtr = (PFNWGLGETPROCADDRESSPROC_PRIVATE)GetProcAddress(
|
||||||
libGL, "wglGetProcAddress");
|
libGL, "wglGetProcAddress");
|
||||||
return gladGetProcAddressPtr != NULL;
|
return gladGetProcAddressPtr != NULL;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -50,7 +69,7 @@ static
|
||||||
void close_gl(void) {
|
void close_gl(void) {
|
||||||
if(libGL != NULL) {
|
if(libGL != NULL) {
|
||||||
FreeLibrary((HMODULE) libGL);
|
FreeLibrary((HMODULE) libGL);
|
||||||
libGL = NULL;
|
libGL = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
@ -113,7 +132,7 @@ void* get_proc(const char *namez) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if(result == NULL) {
|
if(result == NULL) {
|
||||||
#ifdef _WIN32
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||||
result = (void*)GetProcAddress((HMODULE) libGL, namez);
|
result = (void*)GetProcAddress((HMODULE) libGL, namez);
|
||||||
#else
|
#else
|
||||||
result = dlsym(libGL, namez);
|
result = dlsym(libGL, namez);
|
||||||
|
|
4
thirdparty/glad/glad/glad.h
vendored
4
thirdparty/glad/glad/glad.h
vendored
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
|
|
||||||
OpenGL loader generated by glad 0.1.18a0 on Mon Mar 5 18:43:52 2018.
|
OpenGL loader generated by glad 0.1.20a0 on Fri May 4 21:44:11 2018.
|
||||||
|
|
||||||
Language/Generator: C/C++
|
Language/Generator: C/C++
|
||||||
Specification: gl
|
Specification: gl
|
||||||
|
@ -1581,7 +1581,7 @@ GLAPI PFNGLGETTEXLEVELPARAMETERIVPROC glad_glGetTexLevelParameteriv;
|
||||||
typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC)(GLenum cap);
|
typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC)(GLenum cap);
|
||||||
GLAPI PFNGLISENABLEDPROC glad_glIsEnabled;
|
GLAPI PFNGLISENABLEDPROC glad_glIsEnabled;
|
||||||
#define glIsEnabled 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;
|
GLAPI PFNGLDEPTHRANGEPROC glad_glDepthRange;
|
||||||
#define glDepthRange glad_glDepthRange
|
#define glDepthRange glad_glDepthRange
|
||||||
typedef void (APIENTRYP PFNGLVIEWPORTPROC)(GLint x, GLint y, GLsizei width, GLsizei height);
|
typedef void (APIENTRYP PFNGLVIEWPORTPROC)(GLint x, GLint y, GLsizei width, GLsizei height);
|
||||||
|
|
Loading…
Reference in a new issue