diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-04 13:49:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 13:49:22 +0100 |
| commit | 6e13002034152981efdceed864b4e48d70018a49 (patch) | |
| tree | 816cc4307662a7c4d34e3d48049a27c5b6daab09 | |
| parent | 91596f2f7a619d824afb30f0bebb7e153f05b62e (diff) | |
| parent | e860d69183cca1d10560fa541298805fa812b491 (diff) | |
Merge pull request #26576 from akien-mga/glad-0.1.29
glad: Sync with upstream 0.1.29
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/glad/glad.c | 8 | ||||
| -rw-r--r-- | thirdparty/glad/glad/glad.h | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 994a320122..88be3a238e 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -128,7 +128,7 @@ Files extracted from upstream source: ## glad - Upstream: https://github.com/Dav1dde/glad -- Version: 0.1.28 +- Version: 0.1.29 - License: MIT The files we package are automatically generated. diff --git a/thirdparty/glad/glad.c b/thirdparty/glad/glad.c index 8cc09e46e1..e7c64a7e17 100644 --- a/thirdparty/glad/glad.c +++ b/thirdparty/glad/glad.c @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.28 on Thu Nov 22 16:50:04 2018. + OpenGL loader generated by glad 0.1.29 on Mon Mar 4 12:47:22 2019. Language/Generator: C/C++ Specification: gl @@ -180,11 +180,7 @@ static int get_exts(void) { num_exts_i = 0; glGetIntegerv(GL_NUM_EXTENSIONS, &num_exts_i); if (num_exts_i > 0) { - char **tmp_exts_i = (char **)realloc((void *)exts_i, (size_t)num_exts_i * (sizeof *exts_i)); - if (tmp_exts_i == NULL) { - return 0; - } - exts_i = tmp_exts_i; + exts_i = (char **)malloc((size_t)num_exts_i * (sizeof *exts_i)); } if (exts_i == NULL) { diff --git a/thirdparty/glad/glad/glad.h b/thirdparty/glad/glad/glad.h index 52b05e0ae6..6345de6f7a 100644 --- a/thirdparty/glad/glad/glad.h +++ b/thirdparty/glad/glad/glad.h @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.28 on Thu Nov 22 16:50:04 2018. + OpenGL loader generated by glad 0.1.29 on Mon Mar 4 12:47:22 2019. Language/Generator: C/C++ Specification: gl |