X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.h;h=085309e61872a82b058d593fa8af9d546836f613;hb=370eb9e;hp=82f664c1c9b881ae7ffafd083111317cde9f6e29;hpb=6d2e2a0bb28496a8c25b441009bdd2a1a1e72d81;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/pipelinestate_backend.h b/source/backends/vulkan/pipelinestate_backend.h
index 82f664c1..085309e6 100644
--- a/source/backends/vulkan/pipelinestate_backend.h
+++ b/source/backends/vulkan/pipelinestate_backend.h
@@ -11,14 +11,16 @@ class Device;
 
 class VulkanPipelineState: public NonCopyable
 {
+	friend class DescriptorPool;
 	friend class PipelineCache;
 	friend class VulkanCommands;
 
 protected:
 	Device &device;
 	mutable unsigned changes = 0;
+	mutable unsigned unapplied = 0;
 	mutable VkPipeline handle;
-	mutable std::vector<VkDescriptorSet> descriptor_set_handles;
+	mutable std::vector<unsigned> descriptor_set_slots;
 
 	VulkanPipelineState();
 	VulkanPipelineState(VulkanPipelineState &&);
@@ -30,10 +32,11 @@ 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, unsigned, bool) const;
+	void apply(VkCommandBuffer, const VulkanPipelineState *, unsigned, bool) const;
 };
 
 using PipelineStateBackend = VulkanPipelineState;