no clue :) just to push it

[demo] / src / shader.h

diff --git a/src/shader.h b/src/shader.h
index 1472fb3..491eea8 100644 (file)
--- a/src/shader.h
+++ b/src/shader.h
@@ -1,7 +1,16 @@
 #ifndef SHADER_H_
 #define SHADER_H_
 
-enum SType {
+#include <vulkan/vulkan.h>
+
+#include <vector>
+#include <string>
+
+#include <gmath/gmath.h>
+
+class Texture;
+
+enum ShaderType {
        SDR_UNKNOWN,
        SDR_VERTEX,
        SDR_FRAGMENT
@@ -9,19 +18,22 @@ enum SType {
 
 class Shader {
 protected:
+       ShaderType type;
+       std::string name;
+
        virtual bool create(char *buf, unsigned int bsz, const char *fname) = 0;
 
 public:
-       SType type;
-
        Shader();
        virtual ~Shader() = 0;
 
+       virtual bool load(const char *fname, ShaderType type);
        virtual void destroy() = 0;
-       virtual bool load(const char *fname, SType type);
-       virtual void attach(unsigned int prog) = 0; // if vulkan -> leave empty
+       virtual ShaderType get_type();
 };
 
+/* Shader Program */
+
 class ShaderProgram {
 protected:
        Shader *shaders[2];
@@ -30,9 +42,11 @@ public:
        ShaderProgram();
        virtual ~ShaderProgram();
 
-       virtual void add_shader(Shader *sdr);
+       virtual bool create() = 0;
        virtual bool link() = 0;
-       virtual bool load(const char *vfname, const char *ffname) = 0;
+       virtual bool use() const = 0;
+       virtual void destroy() = 0;
+       virtual void attach_shader(Shader *shader) = 0;
 };
 
 #endif // SHADER_H_