diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-05-28 11:45:22 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-05-28 11:45:22 +0100 |
| commit | fdea7529ba09a615d92da5823429b49c7e565c9d (patch) | |
| tree | 67b12689c60dc2e75a5587988dd11bf36c12da9a /lib | |
| parent | Mark main rule as always, so we can always launch it (diff) | |
| parent | Swap GLEW for more modern glad (diff) | |
| download | ilt-fdea7529ba09a615d92da5823429b49c7e565c9d.tar.bz2 ilt-fdea7529ba09a615d92da5823429b49c7e565c9d.tar.xz ilt-fdea7529ba09a615d92da5823429b49c7e565c9d.zip | |
Merge branch 'glad'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/embed-glsl.cpp.m4 | 12 | ||||
| -rw-r--r-- | lib/glArrays.h | 2 | ||||
| -rw-r--r-- | lib/gl_traits.h | 2 | ||||
| -rw-r--r-- | lib/strlen.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/embed-glsl.cpp.m4 b/lib/embed-glsl.cpp.m4 index 8407132..60fb56b 100644 --- a/lib/embed-glsl.cpp.m4 +++ b/lib/embed-glsl.cpp.m4 @@ -1,12 +1,12 @@ -changecom()dnl +changecom() dnl // NAME -#include "substr(TYPE,1)-NAME.h" -#include <GL/glew.h> #include "gfx/gl/shader.h" #include "lib/strlen.h" +#include "substr(TYPE,1)-NAME.h" +#include <glad/gl.h> -constexpr const GLchar * src { R"GLSL-EMBED(dnl -include(SOURCE))GLSL-EMBED" }; -constexpr auto len { constexpr_strlen (src) }; + constexpr const GLchar * src {R"GLSL-EMBED(dnl +include(SOURCE))GLSL-EMBED"}; +constexpr auto len {constexpr_strlen(src)}; const Shader NAME`_'substr(TYPE,1) { src, len, GLTYPE }; diff --git a/lib/glArrays.h b/lib/glArrays.h index 8c8c0bc..86385d9 100644 --- a/lib/glArrays.h +++ b/lib/glArrays.h @@ -1,9 +1,9 @@ #pragma once -#include <GL/glew.h> #include <algorithm> // IWYU pragma: keep #include <array> #include <cstddef> +#include <glad/gl.h> #include <special_members.h> template<size_t N> class glArraysBase { diff --git a/lib/gl_traits.h b/lib/gl_traits.h index 6ff8905..a930eba 100644 --- a/lib/gl_traits.h +++ b/lib/gl_traits.h @@ -1,7 +1,7 @@ #pragma once -#include <GL/glew.h> #include <array> +#include <glad/gl.h> #include <glm/common.hpp> #include <glm/fwd.hpp> diff --git a/lib/strlen.h b/lib/strlen.h index 0053cce..2090d25 100644 --- a/lib/strlen.h +++ b/lib/strlen.h @@ -1,7 +1,7 @@ #pragma once -#include <GL/glew.h> #include <cstddef> +#include <glad/gl.h> constexpr auto constexpr_strlen(const GLchar * const s) |