diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-15 11:56:16 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-15 11:56:16 +0100 |
| commit | dbf6ff0cb663fad1dc4ea5ea2062e1161514478d (patch) | |
| tree | 17ed81dc058b8bb4f420a98ac339d0a1b66fe43f /drivers | |
| parent | 245e6454a03a24bf074eb3715776125842e3b666 (diff) | |
| parent | f6397bffb1e6365e713b653f5ac457b5bd08bfa0 (diff) | |
| download | redot-engine-dbf6ff0cb663fad1dc4ea5ea2062e1161514478d.tar.gz | |
Merge pull request #68372 from Riteo/glad2
Regenerate GL loader code with GLAD 2
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, |