From 3c1c392ab177566f09d11a380210e1937741fad2 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 28 May 2023 11:45:01 +0100 Subject: Swap GLEW for more modern glad --- lib/embed-glsl.cpp.m4 | 12 ++++++------ lib/glArrays.h | 2 +- lib/gl_traits.h | 2 +- lib/strlen.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'lib') 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 #include "gfx/gl/shader.h" #include "lib/strlen.h" +#include "substr(TYPE,1)-NAME.h" +#include -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 #include // IWYU pragma: keep #include #include +#include #include template 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 #include +#include #include #include 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 #include +#include constexpr auto constexpr_strlen(const GLchar * const s) -- cgit v1.2.3