projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backup
[demo]
/
src
/
vulkan
/
shader-vk.h
diff --git
a/src/vulkan/shader-vk.h
b/src/vulkan/shader-vk.h
index
1914a4f
..
b9e4681
100644
(file)
--- a/
src/vulkan/shader-vk.h
+++ b/
src/vulkan/shader-vk.h
@@
-7,12
+7,7
@@
/* each shader program will correspond to a pipeline. The pipeline
* must have the cull, zbuffer etc since they can't be dynamic states */
/* each shader program will correspond to a pipeline. The pipeline
* must have the cull, zbuffer etc since they can't be dynamic states */
-struct Pipeline {
-
-};
-
-class ShaderVK : public Shader
-{
+class ShaderVK : public Shader {
protected:
SType type;
std::string name;
protected:
SType type;
std::string name;
@@
-20,24
+15,28
@@
protected:
virtual bool create(char *buf, unsigned int bsz, const char *fname) override;
public:
virtual bool create(char *buf, unsigned int bsz, const char *fname) override;
public:
+ VkShaderModule sm;
+
ShaderVK();
virtual ~ShaderVK();
ShaderVK();
virtual ~ShaderVK();
- virtual bool load(const char *fname, SType type);
+ virtual bool load(const char *fname, SType type) override;
virtual void destroy() override;
};
class ShaderProgramVK : public ShaderProgram
{
virtual void destroy() override;
};
class ShaderProgramVK : public ShaderProgram
{
+private:
+ VkPipeline gpipeline;
+
protected:
protected:
- Pipeline pipeline;
- /*ubo*/
public:
ShaderProgramVK();
virtual ~ShaderProgramVK();
virtual bool create() override;
public:
ShaderProgramVK();
virtual ~ShaderProgramVK();
virtual bool create() override;
+
virtual bool use() const override;
virtual bool link() override;
virtual void destroy() override;
virtual bool use() const override;
virtual bool link() override;
virtual void destroy() override;