Merge remote-tracking branch 'origin/instanced-networks'

1 files changed, 7 insertions, 4 deletions

diff --git a/gfx/gl/shader.h b/gfx/gl/shader.h
index cff2281..c6b45af 100644
--- a/gfx/gl/shader.h
+++ b/gfx/gl/shader.h
@@ -2,20 +2,23 @@
 
 #include <glRef.h>
 #include <glad/gl.h>
-#include <optional>
 #include <string_view>
+#include <thirdparty/ctre/include/ctre.hpp>
 
 class Shader {
 public:
 	using ShaderRef = glRef<GLuint, &glCreateShader, &glDeleteShader>;
 
-	constexpr Shader(const GLchar * text, GLint len, GLuint type) : text {text}, len {len}, type {type} { }
+	constexpr Shader(const GLchar * text, GLuint type) :
+		text {text}, type {type}, lookups {ctre::search<R"(\bGL_[A-Z_]+\b)">(this->text)}
+	{
+	}
 
 	[[nodiscard]] ShaderRef compile() const;
 	static void CheckShaderError(GLuint shader, GLuint flag, bool isProgram, std::string_view errorMessage);
 
 private:
-	const GLchar * text;
-	GLint len;
+	const std::basic_string_view<GLchar> text;
 	GLuint type;
+	bool lookups;
 };