From b95cf46bed86e4d0641f7862cfe550af2bc02d60 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 20 Feb 2021 13:48:31 +0000 Subject: Remove now redundent Shader::Source class Moves compile functionality to GLsource. --- gfx/gl/shader.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gfx/gl/shader.h') diff --git a/gfx/gl/shader.h b/gfx/gl/shader.h index 293ce9b..e4904ed 100644 --- a/gfx/gl/shader.h +++ b/gfx/gl/shader.h @@ -1,7 +1,6 @@ #ifndef SHADER_INCLUDED_H #define SHADER_INCLUDED_H -#include "shader-source.h" #include #include #include @@ -18,18 +17,9 @@ public: void setModel(glm::mat4 model, Program = Program::Basic) const; void setUniform(const GLchar *, glm::vec3 dir) const; -private: - class Source { - public: - using ShaderRef = glRef; - - explicit Source(const GLsource src); - - ShaderRef id; - }; - static void CheckShaderError(GLuint shader, GLuint flag, bool isProgram, std::string_view errorMessage); +private: class ProgramHandle { public: ProgramHandle(GLuint, GLuint); -- cgit v1.2.3