X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.cpp;h=87e03242d329ae90fb66d5346cefe9a4af4e195e;hb=d90a2925adf08409aafbacec94abaffa0da643e6;hp=4eba2895e4925cd9282672a22d207f248ca4d2a4;hpb=a3252b69d94004bcb55a51ea1023ac0cbdbde32d;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp
index 4eba2895..87e03242 100644
--- a/source/backends/vulkan/pipelinestate_backend.cpp
+++ b/source/backends/vulkan/pipelinestate_backend.cpp
@@ -41,6 +41,12 @@ void VulkanPipelineState::update() const
 	if(changes&PipelineState::VERTEX_SETUP)
 		self.vertex_setup->refresh();
 
+	if(changes&PipelineState::SHPROG)
+	{
+		push_const_compat = hash<32>(self.shprog->stage_flags);
+		push_const_compat = hash_update<32>(push_const_compat, self.shprog->get_push_constants_size());
+	}
+
 	constexpr unsigned pipeline_mask = PipelineState::SHPROG|PipelineState::VERTEX_SETUP|PipelineState::FACE_CULL|
 		PipelineState::DEPTH_TEST|PipelineState::STENCIL_TEST|PipelineState::BLEND|PipelineState::PRIMITIVE_TYPE;
 	if(changes&pipeline_mask)
@@ -154,16 +160,16 @@ void VulkanPipelineState::fill_creation_info(vector<char> &buffer) const
 	}
 
 	StructureBuilder sb(buffer, 10);
-	VkGraphicsPipelineCreateInfo *&pipeline_info = sb.add<VkGraphicsPipelineCreateInfo>();
-	VkPipelineInputAssemblyStateCreateInfo *&input_assembly_info = sb.add<VkPipelineInputAssemblyStateCreateInfo>();
-	VkPipelineViewportStateCreateInfo *&viewport_info = sb.add<VkPipelineViewportStateCreateInfo>();
-	VkPipelineRasterizationStateCreateInfo *&raster_info = sb.add<VkPipelineRasterizationStateCreateInfo>();
-	VkPipelineMultisampleStateCreateInfo *&multisample_info = sb.add<VkPipelineMultisampleStateCreateInfo>();
-	VkPipelineDepthStencilStateCreateInfo *&depth_stencil_info = sb.add<VkPipelineDepthStencilStateCreateInfo>();
-	VkPipelineColorBlendStateCreateInfo *&blend_info = sb.add<VkPipelineColorBlendStateCreateInfo>();
-	VkPipelineColorBlendAttachmentState *&blend_attachments = sb.add<VkPipelineColorBlendAttachmentState>(n_color_attachments);
-	VkPipelineDynamicStateCreateInfo *&dynamic_info = sb.add<VkPipelineDynamicStateCreateInfo>();
-	VkDynamicState *&dynamic_states = sb.add<VkDynamicState>(2);
+	VkGraphicsPipelineCreateInfo *const &pipeline_info = sb.add<VkGraphicsPipelineCreateInfo>();
+	VkPipelineInputAssemblyStateCreateInfo *const &input_assembly_info = sb.add<VkPipelineInputAssemblyStateCreateInfo>();
+	VkPipelineViewportStateCreateInfo *const &viewport_info = sb.add<VkPipelineViewportStateCreateInfo>();
+	VkPipelineRasterizationStateCreateInfo *const &raster_info = sb.add<VkPipelineRasterizationStateCreateInfo>();
+	VkPipelineMultisampleStateCreateInfo *const &multisample_info = sb.add<VkPipelineMultisampleStateCreateInfo>();
+	VkPipelineDepthStencilStateCreateInfo *const &depth_stencil_info = sb.add<VkPipelineDepthStencilStateCreateInfo>();
+	VkPipelineColorBlendStateCreateInfo *const &blend_info = sb.add<VkPipelineColorBlendStateCreateInfo>();
+	VkPipelineColorBlendAttachmentState *const &blend_attachments = sb.add<VkPipelineColorBlendAttachmentState>(n_color_attachments);
+	VkPipelineDynamicStateCreateInfo *const &dynamic_info = sb.add<VkPipelineDynamicStateCreateInfo>();
+	VkDynamicState *const &dynamic_states = sb.add<VkDynamicState>(2);
 
 	input_assembly_info->sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
 	input_assembly_info->topology = static_cast<VkPrimitiveTopology>(get_vulkan_primitive_type(self.primitive_type));
@@ -330,9 +336,9 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, unsigned fr
 	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 *const &writes = sb.add<VkWriteDescriptorSet>(n_writes);
+	VkDescriptorBufferInfo *const &buffers = sb.add<VkDescriptorBufferInfo>(n_buffers);
+	VkDescriptorImageInfo *const &images = sb.add<VkDescriptorImageInfo>(n_images);
 
 	VkWriteDescriptorSet *write_ptr = writes;
 	VkDescriptorBufferInfo *buffer_ptr = buffers;
@@ -380,10 +386,9 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, unsigned fr
 	return n_writes;
 }
 
-void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipelineState *last, unsigned frame, bool negative_viewport) const
+void VulkanPipelineState::apply(const VulkanCommandRecorder &vkCmd, const VulkanPipelineState *last, unsigned frame, bool negative_viewport) const
 {
 	const PipelineState &self = *static_cast<const PipelineState *>(this);
-	const VulkanFunctions &vk = device.get_functions();
 
 	if(!last)
 	{
@@ -396,7 +401,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe
 		if(handle!=last->handle)
 		{
 			unapplied |= PipelineState::SHPROG;
-			if(self.shprog->stage_flags!=last_ps.shprog->stage_flags)
+			if(self.push_const_compat!=last_ps.push_const_compat)
 			{
 				unapplied |= PipelineState::UNIFORMS;
 				first_changed_desc_set = 0;
@@ -418,14 +423,14 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe
 	}
 
 	if(unapplied&PipelineState::SHPROG)
-		vk.CmdBindPipeline(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, handle);
+		vkCmd.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, handle);
 
 	if(unapplied&PipelineState::VERTEX_SETUP)
 		if(const VertexSetup *vs = self.vertex_setup)
 		{
-			vk.CmdBindVertexBuffers(command_buffer, 0, vs->n_bindings, vs->buffers, vs->offsets);
+			vkCmd.BindVertexBuffers(0, vs->n_bindings, vs->buffers, vs->offsets);
 			VkIndexType index_type = static_cast<VkIndexType>(get_vulkan_index_type(vs->get_index_type()));
-			vk.CmdBindIndexBuffer(command_buffer, vs->get_index_buffer()->handle, 0, index_type);
+			vkCmd.BindIndexBuffer(vs->get_index_buffer()->handle, 0, index_type);
 		}
 
 	if(!self.uniform_blocks.empty())
@@ -434,7 +439,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe
 		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, self.shprog->stage_flags,
+			vkCmd.PushConstants(self.shprog->layout_handle, self.shprog->stage_flags,
 				pc_block.get_offset(), pc_block.get_data_size(), pc_block.get_data_pointer());
 		}
 	}
@@ -447,7 +452,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe
 			descriptor_set_handles.push_back(device.get_descriptor_pool().get_descriptor_set(
 				self.descriptor_set_slots[i], self, i, frame));
 
-		vk.CmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, self.shprog->layout_handle,
+		vkCmd.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, self.shprog->layout_handle,
 			first_changed_desc_set, descriptor_set_handles.size(), descriptor_set_handles.data(), 0, 0);
 	}
 
@@ -470,7 +475,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe
 			}
 			viewport.minDepth = 0.0f;
 			viewport.maxDepth = 1.0f;
-			vk.CmdSetViewport(command_buffer, 0, 1, &viewport);
+			vkCmd.SetViewport(0, 1, &viewport);
 		}
 
 		if(unapplied&PipelineState::SCISSOR)
@@ -481,7 +486,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe
 			scissor.offset.y = scissor_rect.bottom;
 			scissor.extent.width = scissor_rect.width;
 			scissor.extent.height = scissor_rect.height;
-			vk.CmdSetScissor(command_buffer, 0, 1, &scissor);
+			vkCmd.SetScissor(0, 1, &scissor);
 		}
 	}