Always apply push constants

[libs/gl.git] / source / backends / vulkan / pipelinestate_backend.cpp

diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp
index 080a4a5d8590c52491fdbf5a5671709b32fd1c7c..4714ff67015a1fe736d3459f1375f8a39ccd4677 100644 (file)
--- a/source/backends/vulkan/pipelinestate_backend.cpp
+++ b/source/backends/vulkan/pipelinestate_backend.cpp
@@ -40,13 +40,15 @@ 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)
+                       if(u.changed || changed_sets==~0U)
                        {
-                               changed_sets |= 1<<(u.binding>>20);
+                               u.used = self.shprog->uses_binding(u.binding);
+                               if(u.binding>=0)
+                                       changed_sets |= 1<<(u.binding>>20);
                                u.changed = false;
                        }
 
@@ -208,6 +210,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;
@@ -253,7 +260,7 @@ uint64_t VulkanPipelineState::compute_descriptor_set_hash(unsigned index) const
 
        uint64_t result = hash<64>(0, 0);
        for(const PipelineState::BoundUniformBlock &b: self.uniform_blocks)
-               if(b.block && b.binding>=0 && static_cast<unsigned>(b.binding>>20)==index)
+               if(b.used && b.binding>=0 && static_cast<unsigned>(b.binding>>20)==index)
                {
                        result = hash_update<64>(result, b.binding);
                        result = hash_update<64>(result, reinterpret_cast<uintptr_t>(b.block));
@@ -273,7 +280,7 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char
 
        unsigned n_buffers = 0;
        for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks)
-               if(u.block && u.binding>=0 && static_cast<unsigned>(u.binding>>20)==index)
+               if(u.used && u.binding>=0 && static_cast<unsigned>(u.binding>>20)==index)
                        ++n_buffers;
 
        StructureBuilder sb(buffer, 2);
@@ -284,7 +291,7 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char
        VkDescriptorBufferInfo *buffer_ptr = buffers;
 
        for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks)
-               if(u.block && u.binding>=0 && static_cast<unsigned>(u.binding>>20)==index)
+               if(u.used && u.binding>=0 && static_cast<unsigned>(u.binding>>20)==index)
                {
                        buffer_ptr->buffer = handle_cast<::VkBuffer>(u.block->get_buffer()->handle);
                        buffer_ptr->offset = u.block->get_offset();
@@ -319,7 +326,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer) const
        if(!self.uniform_blocks.empty())
        {
                const PipelineState::BoundUniformBlock &first_block = self.uniform_blocks.front();
-               if(first_block.block && 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,