vulkan: Use 3 descriptor sets, not 3 bindings

It turns out variable length is only supported for the last binding in
a set, not for every binding.
So we need to create one set for each of our arrays.

[ VUID-VkDescriptorSetLayoutBindingFlagsCreateInfo-pBindingFlags-03004 ] Object 0: handle = 0x33a9f10, type = VK_OBJECT_TYPE_DEVICE; | MessageID = 0xd3f353a | vkCreateDescriptorSetLayout(): pBindings[0] has VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT but 0 is the largest value of all the bindings. The Vulkan spec states: If an element of pBindingFlags includes VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT, then all other elements of VkDescriptorSetLayoutCreateInfo::pBindings must have a smaller value of binding (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkDescriptorSetLayoutBindingFlagsCreateInfo-pBindingFlags-03004)

diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c
index bb4c0001f3c68df9beb3d47517de8f7729fbb018..8f39b7a78c68f7aa627c31eeb11088e0a4e1697f 100644 (file)
--- a/gsk/vulkan/gskvulkanrender.c
+++ b/gsk/vulkan/gskvulkanrender.c
@@ -41,6 +41,8 @@
 #define GDK_ARRAY_NO_MEMSET 1
 #include "gdk/gdkarrayimpl.c"
 
+#define N_DESCRIPTOR_SETS 3
+
 struct _GskVulkanRender
 {
   GskRenderer *renderer;
@@ -52,7 +54,7 @@ struct _GskVulkanRender
 
   GskVulkanCommandPool *command_pool;
   VkFence fence;
-  VkDescriptorSetLayout descriptor_set_layout;
+  VkDescriptorSetLayout descriptor_set_layouts[N_DESCRIPTOR_SETS];
   VkPipelineLayout pipeline_layout;
   GskVulkanUploader *uploader;
 
@@ -60,7 +62,7 @@ struct _GskVulkanRender
   GskDescriptorImageInfos descriptor_samplers;
   GskDescriptorBufferInfos descriptor_buffers;
   VkDescriptorPool descriptor_pool;
-  VkDescriptorSet descriptor_set;
+  VkDescriptorSet descriptor_sets[N_DESCRIPTOR_SETS];
   GskVulkanPipeline *pipelines[GSK_VULKAN_N_PIPELINES];
 
   GskVulkanImage *target;
@@ -148,9 +150,9 @@ gsk_vulkan_render_new (GskRenderer      *renderer,
                                         &(VkDescriptorPoolCreateInfo) {
                                             .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
                                             .flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT,
-                                            .maxSets = 1,
-                                            .poolSizeCount = 3,
-                                            .pPoolSizes = (VkDescriptorPoolSize[3]) {
+                                            .maxSets = N_DESCRIPTOR_SETS,
+                                            .poolSizeCount = N_DESCRIPTOR_SETS,
+                                            .pPoolSizes = (VkDescriptorPoolSize[N_DESCRIPTOR_SETS]) {
                                                 {
                                                     .type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
                                                     .descriptorCount = DESCRIPTOR_POOL_MAXITEMS
@@ -171,7 +173,7 @@ gsk_vulkan_render_new (GskRenderer      *renderer,
   GSK_VK_CHECK (vkCreateDescriptorSetLayout, device,
                                              &(VkDescriptorSetLayoutCreateInfo) {
                                                  .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
-                                                 .bindingCount = 3,
+                                                 .bindingCount = 1,
                                                  .flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT,
                                                  .pBindings = (VkDescriptorSetLayoutBinding[3]) {
                                                      {
@@ -179,15 +181,55 @@ gsk_vulkan_render_new (GskRenderer      *renderer,
                                                          .descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
                                                          .descriptorCount = DESCRIPTOR_POOL_MAXITEMS,
                                                          .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT
-                                                     },
+                                                     }
+                                                 },
+                                                 .pNext = &(VkDescriptorSetLayoutBindingFlagsCreateInfo) {
+                                                   .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO,
+                                                   .bindingCount = 1,
+                                                   .pBindingFlags = (VkDescriptorBindingFlags[1]) {
+                                                     VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT
+                                                     | VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT
+                                                     | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT,
+                                                   },
+                                                 }
+                                             },
+                                             NULL,
+                                             &self->descriptor_set_layouts[0]);
+
+  GSK_VK_CHECK (vkCreateDescriptorSetLayout, device,
+                                             &(VkDescriptorSetLayoutCreateInfo) {
+                                                 .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
+                                                 .bindingCount = 1,
+                                                 .flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT,
+                                                 .pBindings = (VkDescriptorSetLayoutBinding[1]) {
                                                      {
-                                                         .binding = 1,
+                                                         .binding = 0,
                                                          .descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER,
                                                          .descriptorCount = DESCRIPTOR_POOL_MAXITEMS,
                                                          .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT
-                                                     },
+                                                     }
+                                                 },
+                                                 .pNext = &(VkDescriptorSetLayoutBindingFlagsCreateInfo) {
+                                                   .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO,
+                                                   .bindingCount = 1,
+                                                   .pBindingFlags = (VkDescriptorBindingFlags[1]) {
+                                                     VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT
+                                                     | VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT
+                                                     | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT,
+                                                   },
+                                                 }
+                                             },
+                                             NULL,
+                                             &self->descriptor_set_layouts[1]);
+
+  GSK_VK_CHECK (vkCreateDescriptorSetLayout, device,
+                                             &(VkDescriptorSetLayoutCreateInfo) {
+                                                 .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
+                                                 .bindingCount = 1,
+                                                 .flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT,
+                                                 .pBindings = (VkDescriptorSetLayoutBinding[1]) {
                                                      {
-                                                         .binding = 2,
+                                                         .binding = 0,
                                                          .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
                                                          .descriptorCount = DESCRIPTOR_POOL_MAXITEMS,
                                                          .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT
@@ -195,14 +237,8 @@ gsk_vulkan_render_new (GskRenderer      *renderer,
                                                  },
                                                  .pNext = &(VkDescriptorSetLayoutBindingFlagsCreateInfo) {
                                                    .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO,
-                                                   .bindingCount = 3,
-                                                   .pBindingFlags = (VkDescriptorBindingFlags[3]) {
-                                                     VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT
-                                                     | VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT
-                                                     | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT,
-                                                     VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT
-                                                     | VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT
-                                                     | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT,
+                                                   .bindingCount = 1,
+                                                   .pBindingFlags = (VkDescriptorBindingFlags[1]) {
                                                      VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT
                                                      | VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT
                                                      | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT,
@@ -210,15 +246,13 @@ gsk_vulkan_render_new (GskRenderer      *renderer,
                                                  }
                                              },
                                              NULL,
-                                             &self->descriptor_set_layout);
+                                             &self->descriptor_set_layouts[2]);
 
   GSK_VK_CHECK (vkCreatePipelineLayout, device,
                                         &(VkPipelineLayoutCreateInfo) {
                                             .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
-                                            .setLayoutCount = 1,
-                                            .pSetLayouts = (VkDescriptorSetLayout[1]) {
-                                              self->descriptor_set_layout
-                                            },
+                                            .setLayoutCount = G_N_ELEMENTS (self->descriptor_set_layouts),
+                                            .pSetLayouts = self->descriptor_set_layouts,
                                             .pushConstantRangeCount = gsk_vulkan_push_constants_get_range_count (),
                                             .pPushConstantRanges = gsk_vulkan_push_constants_get_ranges ()
                                         },
@@ -403,10 +437,18 @@ gsk_vulkan_render_get_pipeline (GskVulkanRender       *self,
   return self->pipelines[type];
 }
 
-VkDescriptorSet
-gsk_vulkan_render_get_descriptor_set (GskVulkanRender *self)
+void
+gsk_vulkan_render_bind_descriptor_sets (GskVulkanRender *self,
+                                        VkCommandBuffer  command_buffer)
 {
-  return self->descriptor_set;
+  vkCmdBindDescriptorSets (command_buffer,
+                           VK_PIPELINE_BIND_POINT_GRAPHICS,
+                           self->pipeline_layout,
+                           0,
+                           3,
+                           self->descriptor_sets,
+                           0,
+                           NULL);
 }
 
 gsize
@@ -537,11 +579,6 @@ gsk_vulkan_render_prepare_descriptor_sets (GskVulkanRender *self)
       gsk_vulkan_render_pass_reserve_descriptor_sets (pass, self);
     }
   
-  if (gsk_descriptor_image_infos_get_size (&self->descriptor_samplers) == 0 &&
-      gsk_descriptor_image_infos_get_size (&self->descriptor_images) == 0 &&
-      gsk_descriptor_buffer_infos_get_size (&self->descriptor_buffers) == 0)
-    return;
-
   if (self->storage_buffer_memory)
     {
       gsk_vulkan_buffer_unmap (self->storage_buffer);
@@ -553,26 +590,26 @@ gsk_vulkan_render_prepare_descriptor_sets (GskVulkanRender *self)
                                           &(VkDescriptorSetAllocateInfo) {
                                               .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
                                               .descriptorPool = self->descriptor_pool,
-                                              .descriptorSetCount = 1,
-                                              .pSetLayouts = &self->descriptor_set_layout,
+                                              .descriptorSetCount = N_DESCRIPTOR_SETS,
+                                              .pSetLayouts = self->descriptor_set_layouts,
                                               .pNext = &(VkDescriptorSetVariableDescriptorCountAllocateInfo) {
                                                 .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO,
-                                                .descriptorSetCount = 1,
-                                                .pDescriptorCounts = (uint32_t[1]) {
-                                                  gsk_descriptor_image_infos_get_size (&self->descriptor_images)
-                                                  + gsk_descriptor_image_infos_get_size (&self->descriptor_samplers)
-                                                  + gsk_descriptor_buffer_infos_get_size (&self->descriptor_buffers)
+                                                .descriptorSetCount = N_DESCRIPTOR_SETS,
+                                                .pDescriptorCounts = (uint32_t[N_DESCRIPTOR_SETS]) {
+                                                  MAX (1, gsk_descriptor_image_infos_get_size (&self->descriptor_images)),
+                                                  MAX (1, gsk_descriptor_image_infos_get_size (&self->descriptor_samplers)),
+                                                  MAX (1, gsk_descriptor_buffer_infos_get_size (&self->descriptor_buffers))
                                                 }
                                               }
                                           },
-                                          &self->descriptor_set);
+                                          self->descriptor_sets);
 
   n_descriptor_sets = 0;
   if (gsk_descriptor_image_infos_get_size (&self->descriptor_images) > 0)
     {
       descriptor_sets[n_descriptor_sets++] = (VkWriteDescriptorSet) {
           .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
-          .dstSet = self->descriptor_set,
+          .dstSet = self->descriptor_sets[0],
           .dstBinding = 0,
           .dstArrayElement = 0,
           .descriptorCount = gsk_descriptor_image_infos_get_size (&self->descriptor_images),
@@ -584,8 +621,8 @@ gsk_vulkan_render_prepare_descriptor_sets (GskVulkanRender *self)
     {
       descriptor_sets[n_descriptor_sets++] = (VkWriteDescriptorSet) {
           .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
-          .dstSet = self->descriptor_set,
-          .dstBinding = 1,
+          .dstSet = self->descriptor_sets[1],
+          .dstBinding = 0,
           .dstArrayElement = 0,
           .descriptorCount = gsk_descriptor_image_infos_get_size (&self->descriptor_samplers),
           .descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER,
@@ -596,8 +633,8 @@ gsk_vulkan_render_prepare_descriptor_sets (GskVulkanRender *self)
     {
       descriptor_sets[n_descriptor_sets++] = (VkWriteDescriptorSet) {
           .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
-          .dstSet = self->descriptor_set,
-          .dstBinding = 2,
+          .dstSet = self->descriptor_sets[2],
+          .dstBinding = 0,
           .dstArrayElement = 0,
           .descriptorCount = gsk_descriptor_buffer_infos_get_size (&self->descriptor_buffers),
           .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
@@ -741,9 +778,10 @@ gsk_vulkan_render_free (GskVulkanRender *self)
   gsk_descriptor_image_infos_clear (&self->descriptor_samplers);
   gsk_descriptor_buffer_infos_clear (&self->descriptor_buffers);
 
-  vkDestroyDescriptorSetLayout (device,
-                                self->descriptor_set_layout,
-                                NULL);
+  for (i = 0; i < N_DESCRIPTOR_SETS; i++)
+    vkDestroyDescriptorSetLayout (device,
+                                  self->descriptor_set_layouts[i],
+                                  NULL);
 
   vkDestroyFence (device,
                   self->fence,

diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index 96904e67118c880e918a117835c50efb1d3fb7a7..eb66a564828ef9b3d772b688de59e56984156b95 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -2436,7 +2436,6 @@ gsk_vulkan_render_pass_draw (GskVulkanRenderPass *self,
                              VkPipelineLayout     pipeline_layout,
                              VkCommandBuffer      command_buffer)
 {
-  VkDescriptorSet descriptor_set;
   cairo_rectangle_int_t rect;
 
   vkCmdSetViewport (command_buffer,
@@ -2469,16 +2468,7 @@ gsk_vulkan_render_pass_draw (GskVulkanRenderPass *self,
                         },
                         VK_SUBPASS_CONTENTS_INLINE);
 
-  descriptor_set = gsk_vulkan_render_get_descriptor_set (render);
-  if (descriptor_set)
-    vkCmdBindDescriptorSets (command_buffer,
-                             VK_PIPELINE_BIND_POINT_GRAPHICS,
-                             pipeline_layout,
-                             0,
-                             1,
-                             &descriptor_set,
-                             0,
-                             NULL);
+  gsk_vulkan_render_bind_descriptor_sets (render, command_buffer);
 
   gsk_vulkan_render_pass_draw_rect (self, render, pipeline_layout, command_buffer);
 

diff --git a/gsk/vulkan/gskvulkanrenderprivate.h b/gsk/vulkan/gskvulkanrenderprivate.h
index d09feaf28408bfbbd71d25a38d0071879e13e9b5..112b657785414723c102a56ea248f2770a28e903 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderprivate.h
+++ b/gsk/vulkan/gskvulkanrenderprivate.h
@@ -93,7 +93,8 @@ guchar *                gsk_vulkan_render_get_buffer_memory             (GskVulk
                                                                          gsize                   size,
                                                                          gsize                   alignment,
                                                                          gsize                  *out_offset);
-VkDescriptorSet         gsk_vulkan_render_get_descriptor_set            (GskVulkanRender        *self);
+void                    gsk_vulkan_render_bind_descriptor_sets          (GskVulkanRender        *self,
+                                                                         VkCommandBuffer         command_buffer);
 
 void                    gsk_vulkan_render_draw                          (GskVulkanRender        *self);
 

diff --git a/gsk/vulkan/resources/common.frag.glsl b/gsk/vulkan/resources/common.frag.glsl
index 043d15a22e503905d7ae6b4370c68851f0a06366..314477f6971345be7bd81ecbe6aae00ee2123a8c 100644 (file)
--- a/gsk/vulkan/resources/common.frag.glsl
+++ b/gsk/vulkan/resources/common.frag.glsl
@@ -1,6 +1,6 @@
 layout(set = 0, binding = 0) uniform texture2D textures[50000];
-layout(set = 0, binding = 1) uniform sampler samplers[50000];
-layout(set = 0, binding = 2) readonly buffer FloatBuffers {
+layout(set = 1, binding = 0) uniform sampler samplers[50000];
+layout(set = 2, binding = 0) readonly buffer FloatBuffers {
   float floats[];
 } buffers[50000];