chore: remove "bNonUniformIndexing" from plTextureBinding

Author: hoffstadt

extensions/pl_graphics_ext.h

@@ -898,7 +898,6 @@ typedef struct _plTextureBinding
     uint32_t             uSlot;
     uint32_t             uDescriptorCount; // 0 - will become 1
     plShaderStageFlags   eStages;
-    bool                 bNonUniformIndexing; // only available if device capability has PL_DEVICE_CAPABILITY_BIND_GROUP_INDEXING
 } plTextureBinding;
 
 typedef struct _plBufferBinding

extensions/pl_graphics_vulkan.c

@@ -1042,7 +1042,13 @@ pl_graphics_create_bind_group_layout(plDevice* ptDevice, const plBindGroupLayout
             .stageFlags         = pl_vulkan_shader_stage_flags(ptDesc->atBufferBindings[i].eStages),
             .pImmutableSamplers = NULL
         };
-        atDescriptorSetLayoutFlags[uCurrentBinding] = 0;
+
+        if (ptDevice->tInfo.eCapabilities & PL_DEVICE_CAPABILITY_BIND_GROUP_INDEXING)
+        {
+            atDescriptorSetLayoutFlags[uCurrentBinding] |= VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT;
+        }
+        else
+            atDescriptorSetLayoutFlags[uCurrentBinding] = 0;
         atDescriptorSetLayoutBindings[uCurrentBinding++] = tBinding;
     }
 
@@ -1068,12 +1074,12 @@ pl_graphics_create_bind_group_layout(plDevice* ptDevice, const plBindGroupLayout
         else if (tBinding.descriptorCount == 0)
             tBinding.descriptorCount = 1;
 
-        atDescriptorSetLayoutFlags[uCurrentBinding] = 0;
-        if (ptDesc->atTextureBindings[i].bNonUniformIndexing)
+        if (ptDevice->tInfo.eCapabilities & PL_DEVICE_CAPABILITY_BIND_GROUP_INDEXING)
         {
             atDescriptorSetLayoutFlags[uCurrentBinding] |= VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT;
-            bHasVariableDescriptors = true;
         }
+        else
+            atDescriptorSetLayoutFlags[uCurrentBinding] = 0;
         atDescriptorSetLayoutBindings[uCurrentBinding++] = tBinding;
     }
 
@@ -1088,7 +1094,12 @@ pl_graphics_create_bind_group_layout(plDevice* ptDevice, const plBindGroupLayout
             .pImmutableSamplers = NULL
         };
 
-        atDescriptorSetLayoutFlags[uCurrentBinding] = 0;
+        if (ptDevice->tInfo.eCapabilities & PL_DEVICE_CAPABILITY_BIND_GROUP_INDEXING)
+        {
+            atDescriptorSetLayoutFlags[uCurrentBinding] |= VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT;
+        }
+        else
+            atDescriptorSetLayoutFlags[uCurrentBinding] = 0;
         atDescriptorSetLayoutBindings[uCurrentBinding++] = tBinding;
     }
 
@@ -3409,6 +3420,9 @@ pl_graphics_enumerate_devices(plDeviceInfo *atDeviceInfo, uint32_t* puDeviceCoun
         // binding flags for textures, uniforms, and buffers
         // are required for our extension
         if (tDescriptorIndexingFeatures.shaderSampledImageArrayNonUniformIndexing &&
+            tDescriptorIndexingFeatures.descriptorBindingUniformBufferUpdateAfterBind &&
+            tDescriptorIndexingFeatures.descriptorBindingStorageImageUpdateAfterBind &&
+            tDescriptorIndexingFeatures.descriptorBindingStorageBufferUpdateAfterBind &&
             tDescriptorIndexingFeatures.descriptorBindingSampledImageUpdateAfterBind)
         {
             atDeviceInfo[i].eCapabilities |= PL_DEVICE_CAPABILITY_BIND_GROUP_INDEXING;

extensions/pl_shader_variant_ext.c

@@ -1208,7 +1208,6 @@ pl__shader_tools_bind_group_layout_desc(plJsonObject* ptBindGroupLayout)
     {
         plJsonObject* ptBinding = pl_json_member_by_index(ptTextureBindings, j);
         tDesc.atTextureBindings[j].uSlot = pl_json_uint_member(ptBinding, "uSlot", 0);
-        tDesc.atTextureBindings[j].bNonUniformIndexing = pl_json_bool_member(ptBinding, "bNonUniformIndexing", false);
         tDesc.atTextureBindings[j].uDescriptorCount = pl_json_uint_member(ptBinding, "uDescriptorCount", 0);
 
         char acTypeBuffer[64] = {0};

shaders/shaders.pls

@@ -15,8 +15,8 @@
                 { "uSlot": 7, "eStages": ["PL_SHADER_STAGE_FRAGMENT", "PL_SHADER_STAGE_VERTEX"] }
             ],
             "atTextureBindings": [
-                { "uSlot":    8, "eType": "PL_TEXTURE_BINDING_TYPE_SAMPLED", "bNonUniformIndexing": true, "uDescriptorCount": 4096, "eStages": ["PL_SHADER_STAGE_FRAGMENT", "PL_SHADER_STAGE_VERTEX"]},
-                { "uSlot": 4104, "eType": "PL_TEXTURE_BINDING_TYPE_SAMPLED", "bNonUniformIndexing": true, "uDescriptorCount": 4096, "eStages": ["PL_SHADER_STAGE_FRAGMENT", "PL_SHADER_STAGE_VERTEX"]}
+                { "uSlot":    8, "eType": "PL_TEXTURE_BINDING_TYPE_SAMPLED", "uDescriptorCount": 4096, "eStages": ["PL_SHADER_STAGE_FRAGMENT", "PL_SHADER_STAGE_VERTEX"]},
+                { "uSlot": 4104, "eType": "PL_TEXTURE_BINDING_TYPE_SAMPLED", "uDescriptorCount": 4096, "eStages": ["PL_SHADER_STAGE_FRAGMENT", "PL_SHADER_STAGE_VERTEX"]}
             ]
         },
         {