summaryrefslogtreecommitdiff
path: root/gfx/gl/shader.h
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2021-02-20 13:48:31 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2021-02-20 13:59:46 +0000
commitb95cf46bed86e4d0641f7862cfe550af2bc02d60 (patch)
tree2daf2998f6dc3ab6d8761674d8ac107674fc63b7 /gfx/gl/shader.h
parentm4 based GLSL embedding (diff)
downloadilt-b95cf46bed86e4d0641f7862cfe550af2bc02d60.tar.bz2
ilt-b95cf46bed86e4d0641f7862cfe550af2bc02d60.tar.xz
ilt-b95cf46bed86e4d0641f7862cfe550af2bc02d60.zip
Remove now redundent Shader::Source class
Moves compile functionality to GLsource.
Diffstat (limited to 'gfx/gl/shader.h')
-rw-r--r--gfx/gl/shader.h12
1 files changed, 1 insertions, 11 deletions
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 <GL/glew.h>
#include <array>
#include <glRef.hpp>
@@ -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<GLuint, __glewCreateShader, __glewDeleteShader>;
-
- 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);