X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.cpp;h=4f50c77e11b62ed78b736a58fe35ad35dceeee98;hp=1d381022ace90136fc193681d97361a3b5f3d063;hb=b7808c60e0bbbb198500066880b6ed37c0b0e9d0;hpb=50492d9a5106b3dd76e3d6fa5ac88d9f97ba3c47

diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp
index 1d381022..4f50c77e 100644
--- a/source/backends/vulkan/pipelinestate_backend.cpp
+++ b/source/backends/vulkan/pipelinestate_backend.cpp
@@ -35,13 +35,18 @@ void VulkanPipelineState::update() const
 {
 	const PipelineState &self = *static_cast<const PipelineState *>(this);
 
+	unapplied |= changes&(PipelineState::VIEWPORT|PipelineState::SCISSOR|PipelineState::VERTEX_SETUP);
+
 	if(changes&PipelineState::VERTEX_SETUP)
 		self.vertex_setup->refresh();
 
 	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)
+	{
 		handle = device.get_pipeline_cache().get_pipeline(self);
+		unapplied |= PipelineState::SHPROG;
+	}
 
 	if(changes&(PipelineState::SHPROG|PipelineState::UNIFORMS|PipelineState::TEXTURES))
 	{
@@ -74,6 +79,7 @@ void VulkanPipelineState::update() const
 			for(unsigned i=0; i<descriptor_set_handles.size(); ++i)
 				if(changed_sets&(1<<i))
 					descriptor_set_handles[i] = device.get_pipeline_cache().get_descriptor_set(self, i);
+			unapplied |= PipelineState::UNIFORMS;
 		}
 	}
 
@@ -346,19 +352,43 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char
 	return n_writes;
 }
 
-void VulkanPipelineState::apply(VkCommandBuffer command_buffer, unsigned frame, bool negative_viewport) const
+void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipelineState *last, unsigned frame, bool negative_viewport) const
 {
 	const PipelineState &self = *static_cast<const PipelineState *>(this);
 	const VulkanFunctions &vk = device.get_functions();
 
-	vk.CmdBindPipeline(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, handle);
-	if(const VertexSetup *vs = self.vertex_setup)
+	if(!last)
+		unapplied = ~0U;
+	else if(last!=this)
 	{
-		vk.CmdBindVertexBuffers(command_buffer, 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);
+		const PipelineState &last_ps = *static_cast<const PipelineState *>(last);
+		if(handle!=last->handle)
+			unapplied |= PipelineState::SHPROG;
+		if(self.vertex_setup!=last_ps.vertex_setup)
+			unapplied |= PipelineState::VERTEX_SETUP;
+		for(unsigned i=0; (i<descriptor_set_handles.size() && i<last->descriptor_set_handles.size()); ++i)
+			if(descriptor_set_handles[i]!=last->descriptor_set_handles[i])
+			{
+				unapplied |= PipelineState::UNIFORMS;
+				break;
+			}
+		if(self.viewport!=last_ps.viewport)
+			unapplied |= PipelineState::VIEWPORT;
+		if(self.scissor!=last_ps.scissor)
+			unapplied |= PipelineState::SCISSOR;
 	}
 
+	if(unapplied&PipelineState::SHPROG)
+		vk.CmdBindPipeline(command_buffer, 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);
+			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);
+		}
+
 	if(!self.uniform_blocks.empty())
 	{
 		const PipelineState::BoundUniformBlock &first_block = self.uniform_blocks.front();
@@ -370,7 +400,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, unsigned frame,
 		}
 	}
 
-	if(!descriptor_set_handles.empty())
+	if((unapplied&PipelineState::UNIFORMS) && !descriptor_set_handles.empty())
 	{
 		vector<uint32_t> dynamic_offsets;
 		dynamic_offsets.reserve(self.uniform_blocks.size());
@@ -387,30 +417,41 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, unsigned frame,
 			0, descriptor_set_handles.size(), descriptor_set_handles.data(), dynamic_offsets.size(), dynamic_offsets.data());
 	}
 
-	Rect fb_rect = self.framebuffer->get_rect();
-
-	Rect viewport_rect = fb_rect.intersect(self.viewport);
-	VkViewport viewport = { };
-	viewport.x = viewport_rect.left;
-	viewport.y = viewport_rect.bottom;
-	viewport.width = viewport_rect.width;
-	viewport.height = viewport_rect.height;
-	if(negative_viewport)
+	if(unapplied&(PipelineState::VIEWPORT|PipelineState::SCISSOR))
 	{
-		viewport.y += viewport.height;
-		viewport.height = -viewport.height;
+		Rect fb_rect = self.framebuffer->get_rect();
+
+		if(unapplied&PipelineState::VIEWPORT)
+		{
+			Rect viewport_rect = fb_rect.intersect(self.viewport);
+			VkViewport viewport = { };
+			viewport.x = viewport_rect.left;
+			viewport.y = viewport_rect.bottom;
+			viewport.width = viewport_rect.width;
+			viewport.height = viewport_rect.height;
+			if(negative_viewport)
+			{
+				viewport.y += viewport.height;
+				viewport.height = -viewport.height;
+			}
+			viewport.minDepth = 0.0f;
+			viewport.maxDepth = 1.0f;
+			vk.CmdSetViewport(command_buffer, 0, 1, &viewport);
+		}
+
+		if(unapplied&PipelineState::SCISSOR)
+		{
+			Rect scissor_rect = fb_rect.intersect(self.scissor);
+			VkRect2D scissor = { };
+			scissor.offset.x = scissor_rect.left;
+			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);
+		}
 	}
-	viewport.minDepth = 0.0f;
-	viewport.maxDepth = 1.0f;
-	vk.CmdSetViewport(command_buffer, 0, 1, &viewport);
-
-	Rect scissor_rect = fb_rect.intersect(self.scissor);
-	VkRect2D scissor = { };
-	scissor.offset.x = scissor_rect.left;
-	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);
+
+	unapplied = 0;
 }
 
 } // namespace GL