some descriptor functions in vkutil - wip

[demo] / src / vulkan / shader-vk.h

diff --git a/src/vulkan/shader-vk.h b/src/vulkan/shader-vk.h
index b9e4681..18c8818 100644 (file)
--- a/src/vulkan/shader-vk.h
+++ b/src/vulkan/shader-vk.h
@@ -8,28 +8,28 @@
  * must have the cull, zbuffer etc since they can't be dynamic states */
 
 class ShaderVK : public Shader {
+private:
+       VkShaderModule sdr;
+
 protected:
-       SType type;
+       ShaderType type;
        std::string name;
 
        virtual bool create(char *buf, unsigned int bsz, const char *fname) override;
 
 public:
-       VkShaderModule sm;
 
        ShaderVK();
        virtual ~ShaderVK();
 
-       virtual bool load(const char *fname, SType type) override;
+       virtual bool load(const char *fname, ShaderType type) override;
        virtual void destroy() override;
 };
 
 class ShaderProgramVK : public ShaderProgram
 {
-private:
-       VkPipeline gpipeline;
-
 protected:
+       VkPipeline gpipeline;
 
 public:
        ShaderProgramVK();
@@ -41,19 +41,5 @@ public:
        virtual bool link() 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_VK_H_