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

[demo] / src / shader.h

diff --git a/src/shader.h b/src/shader.h
index a6bec05..5a79b7f 100644 (file)
--- a/src/shader.h
+++ b/src/shader.h
@@ -1,31 +1,55 @@
 #ifndef SHADER_H_
 #define SHADER_H_
 
+#include <vulkan/vulkan.h>
+
+#include <vector>
+#include <string>
+
+#include <gmath/gmath.h>
+
+/*
+       Shader class
+*/
+
 enum SType {
-       SDR_VERTzX,
+       SDR_UNKNOWN,
+       SDR_VERTEX,
        SDR_FRAGMENT
 };
 
 class Shader {
-private:
+protected:
        SType type;
+       std::string name;
+
+       virtual bool create(char *buf, unsigned int bsz, const char *fname) = 0;
 
 public:
+
        Shader();
-       ~Shader();
+       virtual ~Shader() = 0;
 
-       virtual bool load(const char *fname, SType type) = 0;
+       virtual bool load(const char *fname, SType type);
+       virtual void destroy() = 0;
+       virtual SType get_type();
 };
 
+/* Shader Program */
+
 class ShaderProgram {
-private:
+protected:
        Shader *shaders[2];
 
 public:
        ShaderProgram();
-       virtual ~ShaderProgram() = 0;
+       virtual ~ShaderProgram();
 
-       void set_shader(Shader *sdr, SType type);
+       virtual bool create() = 0;
+       virtual bool link() = 0;
+       virtual bool use() const = 0;
+       virtual void destroy() = 0;
+       virtual void attach_shader(Shader *shader) = 0;
 };
 
 #endif // SHADER_H_