From 08028fa1ee17fb755dd07352bc722334df1e96a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 17 Nov 2020 16:42:09 +0100 Subject: [PATCH] glad: Sync with upstream 0.1.34 --- thirdparty/README.md | 2 +- thirdparty/glad/KHR/khrplatform.h | 2 +- thirdparty/glad/glad.c | 2 +- thirdparty/glad/glad/glad.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thirdparty/README.md b/thirdparty/README.md index 47e1926e4ea..35b72622a76 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -115,7 +115,7 @@ Files extracted from upstream source: ## glad - Upstream: https://github.com/Dav1dde/glad -- Version: 0.1.33 (2019) +- Version: 0.1.34 (2020) - License: MIT The files we package are automatically generated. diff --git a/thirdparty/glad/KHR/khrplatform.h b/thirdparty/glad/KHR/khrplatform.h index 5b55ea2b981..dd22d927018 100644 --- a/thirdparty/glad/KHR/khrplatform.h +++ b/thirdparty/glad/KHR/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 diff --git a/thirdparty/glad/glad.c b/thirdparty/glad/glad.c index a1fe4d25ef2..dc1b8cb697e 100644 --- a/thirdparty/glad/glad.c +++ b/thirdparty/glad/glad.c @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.33 on Tue Nov 12 08:44:22 2019. + OpenGL loader generated by glad 0.1.34 on Tue Nov 17 16:41:02 2020. Language/Generator: C/C++ Specification: gl diff --git a/thirdparty/glad/glad/glad.h b/thirdparty/glad/glad/glad.h index fae71a865e7..f211e6aa570 100644 --- a/thirdparty/glad/glad/glad.h +++ b/thirdparty/glad/glad/glad.h @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.33 on Tue Nov 12 08:44:22 2019. + OpenGL loader generated by glad 0.1.34 on Tue Nov 17 16:41:02 2020. Language/Generator: C/C++ Specification: gl