X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fopengl%2Fshader-gl.h;h=d8136f44786221e77ea7bfb7afdf3b491834bc8e;hb=fcd6773bc770425ede4b47a84eef7cc78342542c;hp=a147c5dc997997fec5a0887c4938ba5eb65bb906;hpb=4081e0e8f0f391aa25d67b73c45e73ccacff0f00;p=demo

diff --git a/src/opengl/shader-gl.h b/src/opengl/shader-gl.h
index a147c5d..d8136f4 100644
--- a/src/opengl/shader-gl.h
+++ b/src/opengl/shader-gl.h
@@ -6,29 +6,45 @@
 class ShaderGL : public Shader {
 protected:
 	/* bsz for vulkan, in opengl buf is 0 terminated */
-	unsigned int sdr;
 	virtual bool create(char *buf, unsigned int bsz, const char *fname);
 
 public:
+	unsigned int sdr;
+
 	ShaderGL();
 	virtual ~ShaderGL();
 
-	virtual void destroy();
-	virtual void attach(unsigned int prog);
+	virtual void destroy() override;
 };
 
 class ShaderProgramGL : public ShaderProgram {
 protected:
 	unsigned int prog;
+	bool is_linked;
 
 public:
 	ShaderProgramGL();
 	virtual ~ShaderProgramGL();
 
-	void destroy();
-	void delete_shaders();
-	virtual bool link();
-	virtual bool load(const char *vfname, const char *ffname);
+	virtual bool link() override;
+	virtual bool use() const override;
+	virtual bool create() override;
+	virtual void destroy() override;
+	virtual void attach_shader(Shader *shader) override;
+
+	virtual int get_uniform_location(const char *name) const override;
+
+	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