From 50089bf9969edb5f10ff552b90620a4882e3c474 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 20 Feb 2021 13:38:38 +0000
Subject: m4 based GLSL embedding

Passes a lint check, less mangling, more automation
---
 gfx/gl/shader.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gfx/gl/shader.h')

diff --git a/gfx/gl/shader.h b/gfx/gl/shader.h
index 47a2b7d..293ce9b 100644
--- a/gfx/gl/shader.h
+++ b/gfx/gl/shader.h
@@ -1,6 +1,7 @@
 #ifndef SHADER_INCLUDED_H
 #define SHADER_INCLUDED_H
 
+#include "shader-source.h"
 #include <GL/glew.h>
 #include <array>
 #include <glRef.hpp>
@@ -22,8 +23,7 @@ private:
 	public:
 		using ShaderRef = glRef<GLuint, __glewCreateShader, __glewDeleteShader>;
 
-		Source(const std::basic_string_view<unsigned char> text, GLuint type);
-		Source(const GLchar * text, GLint len, GLuint type);
+		explicit Source(const GLsource src);
 
 		ShaderRef id;
 	};
@@ -32,7 +32,7 @@ private:
 
 	class ProgramHandle {
 	public:
-		explicit ProgramHandle(std::initializer_list<GLuint>);
+		ProgramHandle(GLuint, GLuint);
 		using ProgramRef = glRef<GLuint, __glewCreateProgram, __glewDeleteProgram>;
 
 		ProgramRef m_program;
-- 
cgit v1.2.3