diff options
| author | Riteo <riteo@posteo.net> | 2022-11-07 14:12:21 +0100 |
|---|---|---|
| committer | Riteo <riteo@posteo.net> | 2022-11-14 21:48:01 +0100 |
| commit | f6397bffb1e6365e713b653f5ac457b5bd08bfa0 (patch) | |
| tree | 2255fcad6ba3363f877ea45f91dd3a6c0a184039 /drivers | |
| parent | aa4c286808bbf4b16346de40307fcd5b29f19697 (diff) | |
Regenerate GL loader code with GLAD 2
GLAD 1 creates unusable loaders for EGL, while the newly released GLAD 2
does not, so for consistency I thought that it would be a good idea to
uniform things beforehand. While it had some API changes some renames
were all that was needed and everything works like before, at least on
the Wayland branch.
I've kept the structure identical, although this new generator has quite
a few hefty features, such as a single header mode.
I've also added GLAD to `thirdparty/README.md`, but I haven't specified
that in the commit title because it's a very small "fix".
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gl_context/SCsub | 2 | ||||
| -rw-r--r-- | drivers/gles3/rasterizer_gles3.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index 7e8bd22960..2204c486c6 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -6,7 +6,7 @@ if env["platform"] in ["haiku", "macos", "windows", "linuxbsd"]: # Thirdparty source files thirdparty_dir = "#thirdparty/glad/" thirdparty_sources = [ - "glad.c", + "gl.c", ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp index b2d01b02fb..1b42b55425 100644 --- a/drivers/gles3/rasterizer_gles3.cpp +++ b/drivers/gles3/rasterizer_gles3.cpp @@ -199,7 +199,7 @@ void RasterizerGLES3::finalize() { RasterizerGLES3::RasterizerGLES3() { #ifdef GLAD_ENABLED - if (!gladLoadGL()) { + if (!gladLoaderLoadGL()) { ERR_PRINT("Error initializing GLAD"); // FIXME this is an early return from a constructor. Any other code using this instance will crash or the finalizer will crash, because none of // the members of this instance are initialized, so this just makes debugging harder. It should either crash here intentionally, |