summaryrefslogtreecommitdiff
path: root/ThirdParty
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-11-02 19:44:01 +0800
committerchai <chaifix@163.com>2021-11-02 19:44:01 +0800
commit72812a7b47f90f9460e54e8149ba9199a7841244 (patch)
tree9ebdb4b65d7cbbc0a3d7c436a9b45d4eff351b62 /ThirdParty
parentb7511abf1a1f302b5c7ebf50faaf65b62d7bb6ed (diff)
! Text mesh done
Diffstat (limited to 'ThirdParty')
-rw-r--r--ThirdParty/glad/glad.c22
-rw-r--r--ThirdParty/glad/glad.h20
-rw-r--r--ThirdParty/glad/khrplatform.h2
3 files changed, 32 insertions, 12 deletions
diff --git a/ThirdParty/glad/glad.c b/ThirdParty/glad/glad.c
index b6fea1f..c0703ae 100644
--- a/ThirdParty/glad/glad.c
+++ b/ThirdParty/glad/glad.c
@@ -1,22 +1,23 @@
/*
- OpenGL loader generated by glad 0.1.33 on Fri Mar 20 11:13:06 2020.
+ OpenGL loader generated by glad 0.1.34 on Tue Nov 2 08:57:31 2021.
Language/Generator: C/C++
Specification: gl
APIs: gl=3.3
Profile: compatibility
Extensions:
-
+ GL_ARB_map_buffer_alignment,
+ GL_ARB_map_buffer_range
Loader: True
- Local files: False
+ Local files: True
Omit khrplatform: False
Reproducible: False
Commandline:
- --profile="compatibility" --api="gl=3.3" --generator="c" --spec="gl" --extensions=""
+ --profile="compatibility" --api="gl=3.3" --generator="c" --spec="gl" --local-files --extensions="GL_ARB_map_buffer_alignment,GL_ARB_map_buffer_range"
Online:
- https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D3.3
+ https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D3.3&extensions=GL_ARB_map_buffer_alignment&extensions=GL_ARB_map_buffer_range
*/
#include <stdio.h>
@@ -991,6 +992,8 @@ PFNGLWINDOWPOS3IPROC glad_glWindowPos3i = NULL;
PFNGLWINDOWPOS3IVPROC glad_glWindowPos3iv = NULL;
PFNGLWINDOWPOS3SPROC glad_glWindowPos3s = NULL;
PFNGLWINDOWPOS3SVPROC glad_glWindowPos3sv = NULL;
+int GLAD_GL_ARB_map_buffer_alignment = 0;
+int GLAD_GL_ARB_map_buffer_range = 0;
static void load_GL_VERSION_1_0(GLADloadproc load) {
if(!GLAD_GL_VERSION_1_0) return;
glad_glCullFace = (PFNGLCULLFACEPROC)load("glCullFace");
@@ -1754,9 +1757,15 @@ static void load_GL_VERSION_3_3(GLADloadproc load) {
glad_glSecondaryColorP3ui = (PFNGLSECONDARYCOLORP3UIPROC)load("glSecondaryColorP3ui");
glad_glSecondaryColorP3uiv = (PFNGLSECONDARYCOLORP3UIVPROC)load("glSecondaryColorP3uiv");
}
+static void load_GL_ARB_map_buffer_range(GLADloadproc load) {
+ if(!GLAD_GL_ARB_map_buffer_range) return;
+ glad_glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)load("glMapBufferRange");
+ glad_glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)load("glFlushMappedBufferRange");
+}
static int find_extensionsGL(void) {
if (!get_exts()) return 0;
- (void)&has_ext;
+ GLAD_GL_ARB_map_buffer_alignment = has_ext("GL_ARB_map_buffer_alignment");
+ GLAD_GL_ARB_map_buffer_range = has_ext("GL_ARB_map_buffer_range");
free_exts();
return 1;
}
@@ -1835,6 +1844,7 @@ int gladLoadGLLoader(GLADloadproc load) {
load_GL_VERSION_3_3(load);
if (!find_extensionsGL()) return 0;
+ load_GL_ARB_map_buffer_range(load);
return GLVersion.major != 0 || GLVersion.minor != 0;
}
diff --git a/ThirdParty/glad/glad.h b/ThirdParty/glad/glad.h
index cf56144..646b24f 100644
--- a/ThirdParty/glad/glad.h
+++ b/ThirdParty/glad/glad.h
@@ -1,22 +1,23 @@
/*
- OpenGL loader generated by glad 0.1.33 on Fri Mar 20 11:13:06 2020.
+ OpenGL loader generated by glad 0.1.34 on Tue Nov 2 08:57:31 2021.
Language/Generator: C/C++
Specification: gl
APIs: gl=3.3
Profile: compatibility
Extensions:
-
+ GL_ARB_map_buffer_alignment,
+ GL_ARB_map_buffer_range
Loader: True
- Local files: False
+ Local files: True
Omit khrplatform: False
Reproducible: False
Commandline:
- --profile="compatibility" --api="gl=3.3" --generator="c" --spec="gl" --extensions=""
+ --profile="compatibility" --api="gl=3.3" --generator="c" --spec="gl" --local-files --extensions="GL_ARB_map_buffer_alignment,GL_ARB_map_buffer_range"
Online:
- https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D3.3
+ https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D3.3&extensions=GL_ARB_map_buffer_alignment&extensions=GL_ARB_map_buffer_range
*/
@@ -3603,6 +3604,15 @@ typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC)(GLenum type, const GLuint
GLAPI PFNGLSECONDARYCOLORP3UIVPROC glad_glSecondaryColorP3uiv;
#define glSecondaryColorP3uiv glad_glSecondaryColorP3uiv
#endif
+#define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC
+#ifndef GL_ARB_map_buffer_alignment
+#define GL_ARB_map_buffer_alignment 1
+GLAPI int GLAD_GL_ARB_map_buffer_alignment;
+#endif
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+GLAPI int GLAD_GL_ARB_map_buffer_range;
+#endif
#ifdef __cplusplus
}
diff --git a/ThirdParty/glad/khrplatform.h b/ThirdParty/glad/khrplatform.h
index 5b55ea2..dd22d92 100644
--- a/ThirdParty/glad/khrplatform.h
+++ b/ThirdParty/glad/khrplatform.h
@@ -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