diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-21 01:34:10 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-21 01:34:10 +0000 |
| commit | d4ae68b6ba5211c7bc11a52951c466c5050ae377 (patch) | |
| tree | de9d06beede1d7baaf868b6f6c32d3e3c90c5fb3 /lib | |
| parent | Fix includes in test glCtxtBhvr (diff) | |
| download | ilt-d4ae68b6ba5211c7bc11a52951c466c5050ae377.tar.bz2 ilt-d4ae68b6ba5211c7bc11a52951c466c5050ae377.tar.xz ilt-d4ae68b6ba5211c7bc11a52951c466c5050ae377.zip | |
String view/constexpr Shader instances
Gonna need more constexpr stuff and strstr/strlen aren't that
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/embed-glsl.cpp.m4 | 9 | ||||
| -rw-r--r-- | lib/strlen.h | 14 |
2 files changed, 3 insertions, 20 deletions
diff --git a/lib/embed-glsl.cpp.m4 b/lib/embed-glsl.cpp.m4 index 60fb56b..9fe0b41 100644 --- a/lib/embed-glsl.cpp.m4 +++ b/lib/embed-glsl.cpp.m4 @@ -1,12 +1,9 @@ changecom() dnl // NAME #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)}; - -const Shader NAME`_'substr(TYPE,1) { src, len, GLTYPE }; +constexpr Shader NAME`_'substr(TYPE,1) { + R"GLSL-EMBED(dnl + include(SOURCE))GLSL-EMBED", GLTYPE }; diff --git a/lib/strlen.h b/lib/strlen.h deleted file mode 100644 index 2090d25..0000000 --- a/lib/strlen.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include <cstddef> -#include <glad/gl.h> - -constexpr auto -constexpr_strlen(const GLchar * const s) -{ - std::size_t ch {}; - while (s[ch]) { - ch++; - } - return ch; -} |