X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fvulkan%2Fvkutil-pipeline.h;h=281d489e60fe9031dd5ab5e80c5e4588e0425e01;hb=1d424e50420a5b04aadb5abac2c02f4e7b797618;hp=9f8a2666daed72232a286aed5d9520182ec0cf50;hpb=75b8713addd14a845e2fa8ad9a9d3d4a6a323bec;p=demo

diff --git a/src/vulkan/vkutil-pipeline.h b/src/vulkan/vkutil-pipeline.h
index 9f8a266..281d489 100644
--- a/src/vulkan/vkutil-pipeline.h
+++ b/src/vulkan/vkutil-pipeline.h
@@ -2,10 +2,7 @@
 #define VKUTIL_PIPELINE_H_
 
 #include <vulkan/vulkan.h>
-
-#define VERTEX_ATTRIB_BIT (1 << VKU_BIND_VERTEX)
-#define NORMAL_ATTRIB_BIT (1 << VKU_BIND_NORMAL)
-#define TEX_COORD_ATTRIB_BIT (1 << VKU_BIND_TEX_COORD)
+#include <vector>
 
 enum VkuVertexBindings {
 	VKU_BIND_VERTEX,
@@ -33,22 +30,22 @@ private:
 	std::vector<VkVertexInputBindingDescription> bind_descriptions;
 	std::vector<VkVertexInputAttributeDescription> attr_descriptions;
 
-	/* uniforms */
-	std::vector<VkDescriptorSetLayout> dset_layouts;
-	std::vector<VkPushConstantRange> push_const_ranges;
+	/* resources */
+	std::vector<VkDescriptorSetLayout> res_layouts;
+//	std::vector<VkPushConstantRange> push_const_ranges;
+
+	VkPipelineLayout layout;
 
 public:
 	VkuPipelineGenerator();
 	~VkuPipelineGenerator();
 
-	VkPipeline generate(VkuDynState dyn_flags) const;
+	VkPipeline generate(VkuDynState dyn_flags);
 
 	void set_shader_modules(VkShaderModule vs, VkShaderModule fs);
 	void set_attribute(uint32_t binding, uint32_t stride, uint32_t location,
 			VkFormat format);
-	void set_descriptor_set_layout(const vku_descriptor &desc);
-
-	void set_push_constant(); //TODO
+	void set_resources_layout(VkDescriptorSetLayout layout);
 };
 
 #endif // VKUTIL_PIPELINE_H_