X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.cpp;h=4f4f5600bb08cd7c0c19a575adaa7ad26cd934f3;hb=27c06dbcd3af468933170e9f8c738b53b53e0277;hp=4a47b223d992c31ead569b39d49e441bbc76f633;hpb=58c5647c775e38dd08a64ad435dfe0673a62fcd1;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp
index 4a47b223..4f4f5600 100644
--- a/source/backends/vulkan/pipelinestate_backend.cpp
+++ b/source/backends/vulkan/pipelinestate_backend.cpp
@@ -51,6 +51,15 @@ void VulkanPipelineState::update() const
 					changed_sets |= 1<<(u.binding>>20);
 				u.changed = false;
 			}
+		for(const PipelineState::BoundTexture &t: self.textures)
+			if(t.changed || changed_sets==~0U)
+			{
+				t.used = self.shprog->uses_binding(t.binding);
+				changed_sets |= 1<<(t.binding>>20);
+				if(t.sampler)
+					t.sampler->refresh();
+				t.changed = false;
+			}
 
 		descriptor_set_handles.resize(self.shprog->get_n_descriptor_sets());
 		for(unsigned i=0; i<descriptor_set_handles.size(); ++i)
@@ -265,6 +274,13 @@ uint64_t VulkanPipelineState::compute_descriptor_set_hash(unsigned index) const
 			result = hash_update<64>(result, b.binding);
 			result = hash_update<64>(result, reinterpret_cast<uintptr_t>(b.block));
 		}
+	for(const PipelineState::BoundTexture &t: self.textures)
+		if(t.used && (t.binding>>20)==index)
+		{
+			result = hash_update<64>(result, t.binding);
+			result = hash_update<64>(result, reinterpret_cast<uintptr_t>(t.texture));
+			result = hash_update<64>(result, reinterpret_cast<uintptr_t>(t.sampler));
+		}
 
 	return result;
 }
@@ -282,13 +298,20 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char
 	for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks)
 		if(u.used && u.binding>=0 && static_cast<unsigned>(u.binding>>20)==index)
 			++n_buffers;
-
-	StructureBuilder sb(buffer, 2);
-	VkWriteDescriptorSet *&writes = sb.add<VkWriteDescriptorSet>(n_buffers);
+	unsigned n_images = 0;
+	for(const PipelineState::BoundTexture &t: self.textures)
+		if(t.used && (t.binding>>20)==index)
+			++n_images;
+	unsigned n_writes = n_buffers+n_images;
+
+	StructureBuilder sb(buffer, 3);
+	VkWriteDescriptorSet *&writes = sb.add<VkWriteDescriptorSet>(n_writes);
 	VkDescriptorBufferInfo *&buffers = sb.add<VkDescriptorBufferInfo>(n_buffers);
+	VkDescriptorImageInfo *&images = sb.add<VkDescriptorImageInfo>(n_images);
 
 	VkWriteDescriptorSet *write_ptr = writes;
 	VkDescriptorBufferInfo *buffer_ptr = buffers;
+	VkDescriptorImageInfo *image_ptr = images;
 
 	for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks)
 		if(u.used && u.binding>=0 && static_cast<unsigned>(u.binding>>20)==index)
@@ -307,7 +330,24 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char
 			++write_ptr;
 		}
 
-	return n_buffers;
+	for(const PipelineState::BoundTexture &t: self.textures)
+		if(t.used && (t.binding>>20)==index)
+		{
+			image_ptr->sampler = handle_cast<::VkSampler>(t.sampler->handle);
+			image_ptr->imageView = handle_cast<::VkImageView>(t.texture->view_handle);
+			image_ptr->imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+
+			write_ptr->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+			write_ptr->dstBinding = t.binding&0xFFFFF;
+			write_ptr->descriptorCount = 1;
+			write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+			write_ptr->pImageInfo = image_ptr;
+
+			++image_ptr;
+			++write_ptr;
+		}
+
+	return n_writes;
 }
 
 void VulkanPipelineState::apply(VkCommandBuffer command_buffer) const
@@ -326,10 +366,10 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer) const
 	if(!self.uniform_blocks.empty())
 	{
 		const PipelineState::BoundUniformBlock &first_block = self.uniform_blocks.front();
-		if(first_block.used && first_block.binding==ReflectData::PUSH_CONSTANT && first_block.changed)
+		if(first_block.used && first_block.binding==ReflectData::PUSH_CONSTANT)
 		{
 			const UniformBlock &pc_block = *first_block.block;
-			vk.CmdPushConstants(command_buffer, self.shprog->layout_handle, VK_SHADER_STAGE_ALL,
+			vk.CmdPushConstants(command_buffer, self.shprog->layout_handle, self.shprog->stage_flags,
 				pc_block.get_offset(), pc_block.get_data_size(), pc_block.get_data_pointer());
 		}
 	}