Changed the OpenGL part and the GLSL shaders to use UBO and

[demo] / src / opengl / shader-gl.h

diff --git a/src/opengl/shader-gl.h b/src/opengl/shader-gl.h
index 635d6b7..4ee4a57 100644 (file)
--- a/src/opengl/shader-gl.h
+++ b/src/opengl/shader-gl.h
@@ -26,28 +26,11 @@ public:
        ShaderProgramGL();
        virtual ~ShaderProgramGL();
 
-       virtual void cache_uniforms() override;
-
        virtual bool link() override;
-       virtual bool use() override;
+       virtual bool use() const override;
        virtual bool create() override;
        virtual void destroy() override;
        virtual void attach_shader(Shader *shader) override;
-
-       int get_uniform_location(const char *name) const;
-       int get_attribute_location(const char *name) const;
-
-       virtual void set_uniformi(int location, int value) override;
-       virtual void set_uniformi(int location, int x, int y) override;
-       virtual void set_uniformi(int location, int x, int y, int z) override;
-       virtual void set_uniformi(int location, int x, int y, int z, int w) override;
-
-       virtual void set_uniformf(int location, float value) override;
-       virtual void set_uniformf(int location, float x, float y) override;
-       virtual void set_uniformf(int location, float x, float y, float z) override;
-       virtual void set_uniformf(int location, float x, float y, float z, float w) override;
-
-       virtual void set_uniform_matrix(int location, const Mat4 &mat) override;
 };
 
-#endif // SHADER_GL_H_
\ No newline at end of file
+#endif // SHADER_GL_H_