mirror of
https://github.com/godotengine/godot
synced 2024-09-04 22:58:28 +00:00
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".
This commit is contained in:
parent
aa4c286808
commit
f6397bffb1
|
@ -202,6 +202,12 @@ Comment: The FreeType Project
|
|||
Copyright: 1996-2022, David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||
License: FTL
|
||||
|
||||
Files: ./thirdparty/glad/
|
||||
Comment: glad
|
||||
Copyright: 2013-2022, David Herberth
|
||||
2013-2020, The Khronos Group Inc.
|
||||
License: CC0-1.0 and Apache-2.0
|
||||
|
||||
Files: ./thirdparty/glslang/
|
||||
Comment: glslang
|
||||
Copyright: 2015-2020, Google, Inc.
|
||||
|
|
|
@ -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]
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -44,4 +44,4 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#define OPENGL_INCLUDE_H "thirdparty/glad/glad/glad.h"
|
||||
#define OPENGL_INCLUDE_H "thirdparty/glad/glad/gl.h"
|
||||
|
|
|
@ -30,5 +30,5 @@
|
|||
|
||||
#include <alloca.h>
|
||||
|
||||
#define OPENGL_INCLUDE_H "thirdparty/glad/glad/glad.h"
|
||||
#define OPENGL_INCLUDE_H "thirdparty/glad/glad/gl.h"
|
||||
#define PTHREAD_RENAME_SELF
|
||||
|
|
|
@ -30,4 +30,4 @@
|
|||
|
||||
#include <malloc.h>
|
||||
|
||||
#define OPENGL_INCLUDE_H "thirdparty/glad/glad/glad.h"
|
||||
#define OPENGL_INCLUDE_H "thirdparty/glad/glad/gl.h"
|
||||
|
|
15
thirdparty/README.md
vendored
15
thirdparty/README.md
vendored
|
@ -173,6 +173,21 @@ comments. Apply the patches in the `patches/` folder when syncing on newer upstr
|
|||
commits.
|
||||
|
||||
|
||||
## glad
|
||||
|
||||
- Upstream: https://github.com/Dav1dde/glad
|
||||
- Version: 2.0.2 (f237a2bfcec0d9b82b90ec9af4af265c40de7183, 2022)
|
||||
- License: CC0 1.0 and Apache 2.0
|
||||
|
||||
Files extracted from upstream source:
|
||||
- `LICENSE`
|
||||
|
||||
Files generated from [upstream web instance](https://gen.glad.sh/):
|
||||
- `KHR/khrplatform.h`
|
||||
- `gl.c`
|
||||
- `glad/gl.h`
|
||||
|
||||
|
||||
## glslang
|
||||
|
||||
- Upstream: https://github.com/KhronosGroup/glslang
|
||||
|
|
75
thirdparty/glad/LICENSE
vendored
75
thirdparty/glad/LICENSE
vendored
|
@ -1,20 +1,63 @@
|
|||
The MIT License (MIT)
|
||||
The glad source code:
|
||||
|
||||
Copyright (c) 2013-2018 David Herberth
|
||||
The MIT License (MIT)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
Copyright (c) 2013-2022 David Herberth
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
The Khronos Specifications:
|
||||
|
||||
Copyright (c) 2013-2020 The Khronos Group Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
|
||||
The EGL Specification and various headers:
|
||||
|
||||
Copyright (c) 2007-2016 The Khronos Group Inc.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and/or associated documentation files (the
|
||||
"Materials"), to deal in the Materials without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Materials, and to
|
||||
permit persons to whom the Materials are furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Materials.
|
||||
|
||||
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
|
||||
|
|
1995
thirdparty/glad/gl.c
vendored
Normal file
1995
thirdparty/glad/gl.c
vendored
Normal file
File diff suppressed because it is too large
Load diff
1951
thirdparty/glad/glad.c
vendored
1951
thirdparty/glad/glad.c
vendored
File diff suppressed because it is too large
Load diff
3884
thirdparty/glad/glad/gl.h
vendored
Normal file
3884
thirdparty/glad/glad/gl.h
vendored
Normal file
File diff suppressed because it is too large
Load diff
3801
thirdparty/glad/glad/glad.h
vendored
3801
thirdparty/glad/glad/glad.h
vendored
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue