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 abfe364..5a79b7f 100644 (file)
--- a/src/shader.h
+++ b/src/shader.h
@@ -1,6 +1,8 @@
 #ifndef SHADER_H_
 #define SHADER_H_
 
+#include <vulkan/vulkan.h>
+
 #include <vector>
 #include <string>
 
@@ -18,65 +20,36 @@ enum SType {
 
 class Shader {
 protected:
+       SType 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, SType type);
        virtual void destroy() = 0;
+       virtual SType get_type();
 };
 
 /* Shader Program */
 
-struct Uniform {
-       int location;
-       std::string name;
-       int state_idx;
-};
-
 class ShaderProgram {
 protected:
        Shader *shaders[2];
-       std::vector<Uniform> uniforms;
 
 public:
        ShaderProgram();
        virtual ~ShaderProgram();
 
-       virtual void cache_uniforms() = 0;
-
-       virtual void add_shader(Shader *sdr);
-       virtual void delete_shaders() = 0;
-
        virtual bool create() = 0;
        virtual bool link() = 0;
-       virtual bool use() = 0;
+       virtual bool use() const = 0;
        virtual void destroy() = 0;
        virtual void attach_shader(Shader *shader) = 0;
-
-       /*
-               THIS PART MIGHT NEED SEVERAL CHANGES: on vulkan we set the uniforms
-               using descriptor sets. The current design is suitable for OpenGL and
-               it *might* have to be rewritten to work with both APIs later
-       */
-
-       virtual void set_uniformi(int location, int value) = 0;
-       virtual void set_uniformi(int location, int x, int y) = 0;
-       virtual void set_uniformi(int location, int x, int y, int z) = 0;
-       virtual void set_uniformi(int location, int x, int y, int z, int w) = 0;
-
-       virtual void set_uniformf(int location, float value) = 0;
-       virtual void set_uniformf(int location, float x, float y) = 0;
-       virtual void set_uniformf(int location, float x, float y, float z) = 0;
-       virtual void set_uniformf(int location, float x, float y, float z, float w) = 0;
-
-       virtual void set_uniform_matrix(int location, const Mat4 &mat) = 0;
 };
 
-ShaderProgram *get_current_program();
-
 #endif // SHADER_H_