Implement textures and samplers for Vulkan

[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 4714ff67015a1fe736d3459f1375f8a39ccd4677..444d5f664ab9d3c3135c3296881e4fc790fe3b67 100644 (file)
--- a/source/backends/vulkan/pipelinestate_backend.cpp
+++ b/source/backends/vulkan/pipelinestate_backend.cpp
@@ -51,6 +51,15 @@ void VulkanPipelineState::update() const
                                        changed_sets |= 1<<(u.binding>>20);
                                u.changed = false;
                        }
+               for(const PipelineState::BoundTexture &t: self.textures)
+                       if(t.changed || changed_sets==~0U)
+                       {
+                               t.used = self.shprog->uses_binding(t.binding);
+                               changed_sets |= 1<<(t.binding>>20);
+                               if(t.sampler)
+                                       t.sampler->refresh();
+                               t.changed = false;
+                       }
 
                descriptor_set_handles.resize(self.shprog->get_n_descriptor_sets());
                for(unsigned i=0; i<descriptor_set_handles.size(); ++i)
@@ -265,6 +274,13 @@ 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));
                }
+       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));
+               }
 
        return result;
 }
@@ -282,13 +298,20 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char
        for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks)
                if(u.used && u.binding>=0 && static_cast<unsigned>(u.binding>>20)==index)
                        ++n_buffers;
-
-       StructureBuilder sb(buffer, 2);
-       VkWriteDescriptorSet *&writes = sb.add<VkWriteDescriptorSet>(n_buffers);
+       unsigned n_images = 0;
+       for(const PipelineState::BoundTexture &t: self.textures)
+               if(t.used && (t.binding>>20)==index)
+                       ++n_images;
+       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 *write_ptr = writes;
        VkDescriptorBufferInfo *buffer_ptr = buffers;
+       VkDescriptorImageInfo *image_ptr = images;
 
        for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks)
                if(u.used && u.binding>=0 && static_cast<unsigned>(u.binding>>20)==index)
@@ -307,7 +330,24 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char
                        ++write_ptr;
                }
 
-       return n_buffers;
+       for(const PipelineState::BoundTexture &t: self.textures)
+               if(t.used && (t.binding>>20)==index)
+               {
+                       image_ptr->sampler = handle_cast<::VkSampler>(t.sampler->handle);
+                       image_ptr->imageView = handle_cast<::VkImageView>(t.texture->view_handle);
+                       image_ptr->imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+
+                       write_ptr->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+                       write_ptr->dstBinding = t.binding&0xFFFFF;
+                       write_ptr->descriptorCount = 1;
+                       write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+                       write_ptr->pImageInfo = image_ptr;
+
+                       ++image_ptr;
+                       ++write_ptr;
+               }
+
+       return n_writes;
 }
 
 void VulkanPipelineState::apply(VkCommandBuffer command_buffer) const