X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Fvulkan%2Fvkutil-pipeline.h;fp=src%2Fvulkan%2Fvkutil-pipeline.h;h=9cd99fa780aec24c51e445a3839af3271e661547;hp=9f8a2666daed72232a286aed5d9520182ec0cf50;hb=f6ceb163227d00d7f97df1fc2dfbdd419c56277e;hpb=75b8713addd14a845e2fa8ad9a9d3d4a6a323bec

diff --git a/src/vulkan/vkutil-pipeline.h b/src/vulkan/vkutil-pipeline.h
index 9f8a266..9cd99fa 100644
--- a/src/vulkan/vkutil-pipeline.h
+++ b/src/vulkan/vkutil-pipeline.h
@@ -3,10 +3,6 @@
 
 #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)
-
 enum VkuVertexBindings {
 	VKU_BIND_VERTEX,
 	VKU_BIND_NORMAL,
@@ -33,9 +29,9 @@ 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;
 
 public:
 	VkuPipelineGenerator();
@@ -46,9 +42,7 @@ public:
 	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
 };
 
 #endif // VKUTIL_PIPELINE_H_