Use low-level handles when computing descriptor set hashes

[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 a6c9d8ce6754ce28d24002900b47511f21a16a33..65c98b94ffe69c485980c91f1528529bb5797ff5 100644 (file)
--- a/source/backends/vulkan/pipelinestate_backend.cpp
+++ b/source/backends/vulkan/pipelinestate_backend.cpp
@@ -275,14 +275,14 @@ 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));
-                       result = hash_update<64>(result, reinterpret_cast<uintptr_t>(b.buffer));
+                       result = hash_update<64>(result, reinterpret_cast<uintptr_t>(b.buffer->handle));
                }
        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));
+                       result = hash_update<64>(result, reinterpret_cast<uintptr_t>(t.texture->handle));
+                       result = hash_update<64>(result, reinterpret_cast<uintptr_t>(t.sampler->handle));
                        result = hash_update<64>(result, t.level);
                }
 
@@ -327,7 +327,7 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char
                        write_ptr->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
                        write_ptr->dstBinding = u.binding&0xFFFFF;
                        write_ptr->descriptorCount = 1;
-                       write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+                       write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC;
                        write_ptr->pBufferInfo = buffer_ptr;
 
                        ++buffer_ptr;
@@ -357,7 +357,7 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char
        return n_writes;
 }
 
-void VulkanPipelineState::apply(VkCommandBuffer command_buffer, bool negative_viewport) const
+void VulkanPipelineState::apply(VkCommandBuffer command_buffer, unsigned frame, bool negative_viewport) const
 {
        const PipelineState &self = *static_cast<const PipelineState *>(this);
        const VulkanFunctions &vk = device.get_functions();
@@ -382,7 +382,21 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, bool negative_vi
        }
 
        if(!descriptor_set_handles.empty())
-               vk.CmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, self.shprog->layout_handle, 0, descriptor_set_handles.size(), descriptor_set_handles.data(), 0, 0);
+       {
+               vector<uint32_t> dynamic_offsets;
+               dynamic_offsets.reserve(self.uniform_blocks.size());
+               for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks)
+                       if(u.used && u.binding>=0)
+                       {
+                               if(u.buffer->get_usage()==STREAMING)
+                                       dynamic_offsets.push_back(frame*u.buffer->get_size());
+                               else
+                                       dynamic_offsets.push_back(0);
+                       }
+
+               vk.CmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, self.shprog->layout_handle,
+                       0, descriptor_set_handles.size(), descriptor_set_handles.data(), dynamic_offsets.size(), dynamic_offsets.data());
+       }
 
        VkViewport viewport = { };
        if(self.viewport)