X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.h;h=d033fbb8591897309cd4e7c106a204600cd19063;hb=c737d292d49d2d39b44e1cd903c1f8b79174f0d7;hp=d482081bb400d4bc987c71048366eee26585536d;hpb=b7808c60e0bbbb198500066880b6ed37c0b0e9d0;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/pipelinestate_backend.h b/source/backends/vulkan/pipelinestate_backend.h
index d482081b..d033fbb8 100644
--- a/source/backends/vulkan/pipelinestate_backend.h
+++ b/source/backends/vulkan/pipelinestate_backend.h
@@ -11,6 +11,7 @@ class Device;
 
 class VulkanPipelineState: public NonCopyable
 {
+	friend class DescriptorPool;
 	friend class PipelineCache;
 	friend class VulkanCommands;
 
@@ -18,8 +19,10 @@ protected:
 	Device &device;
 	mutable unsigned changes = 0;
 	mutable unsigned unapplied = 0;
-	mutable VkPipeline handle;
-	mutable std::vector<VkDescriptorSet> descriptor_set_handles;
+	mutable VkPipeline handle = 0;
+	mutable std::vector<unsigned> descriptor_set_slots;
+	mutable unsigned first_changed_desc_set = 0;
+	mutable std::uint32_t push_const_compat = 0;
 
 	VulkanPipelineState();
 	VulkanPipelineState(VulkanPipelineState &&);
@@ -31,8 +34,9 @@ protected:
 	std::uint64_t compute_hash() const;
 	void fill_creation_info(std::vector<char> &) const;
 	std::uint64_t compute_descriptor_set_hash(unsigned) const;
+	bool is_descriptor_set_dynamic(unsigned) const;
 	VkDescriptorSetLayout get_descriptor_set_layout(unsigned) const;
-	unsigned fill_descriptor_writes(unsigned, std::vector<char> &) const;
+	unsigned fill_descriptor_writes(unsigned, unsigned, std::vector<char> &) const;
 
 	void apply(VkCommandBuffer, const VulkanPipelineState *, unsigned, bool) const;
 };