X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.cpp;h=32672ec42970b2a5599409375eb9ffcb48c88d4b;hb=02cc42fc113bcc17a28ff9d93a9e4b3f26fbb91f;hp=f25dd2117fcc20baf0919dd875e908ca62a6b0be;hpb=99ca354f18119f82f1adeca100cd665a8f640317;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp
index f25dd211..32672ec4 100644
--- a/source/backends/vulkan/pipelinestate_backend.cpp
+++ b/source/backends/vulkan/pipelinestate_backend.cpp
@@ -40,9 +40,9 @@ void VulkanPipelineState::update() const
 	if(self.changes&pipeline_mask)
 		handle = device.get_pipeline_cache().get_pipeline(self);
 
-	if(self.changes&(PipelineState::UNIFORMS|PipelineState::TEXTURES))
+	if(self.changes&(PipelineState::SHPROG|PipelineState::UNIFORMS|PipelineState::TEXTURES))
 	{
-		unsigned changed_sets = 0;
+		unsigned changed_sets = (self.changes&PipelineState::SHPROG ? ~0U : 0U);
 		for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks)
 			if(u.changed && u.binding>=0)
 			{
@@ -113,7 +113,7 @@ void VulkanPipelineState::fill_creation_info(vector<char> &buffer) const
 	const PipelineState &self = *static_cast<const PipelineState *>(this);
 
 	const FrameFormat &format = self.framebuffer->get_format();
-	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(format, false, false);
+	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(format, false, false, false);
 
 	unsigned n_color_attachments = 0;
 	for(FrameAttachment a: format)
@@ -208,6 +208,11 @@ void VulkanPipelineState::fill_creation_info(vector<char> &buffer) const
 			blend_attachments[i].colorWriteMask = get_vulkan_color_mask(blend->write_mask);
 		}
 	}
+	else
+	{
+		for(unsigned i=0; i<n_color_attachments; ++i)
+			blend_attachments[i].colorWriteMask = VK_COLOR_COMPONENT_R_BIT|VK_COLOR_COMPONENT_G_BIT|VK_COLOR_COMPONENT_B_BIT|VK_COLOR_COMPONENT_A_BIT;
+	}
 
 	blend_info->sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
 	blend_info->attachmentCount = n_color_attachments;