maintenance4 fix in feautes

Author: Erfan-Ahmadi

include/nbl/video/SPhysicalDeviceFeatures.h

@@ -550,10 +550,6 @@ struct SPhysicalDeviceFeatures
     /* PipelineExecutablePropertiesFeaturesKHR *//* VK_KHR_pipeline_executable_properties */
     bool pipelineExecutableInfo = false;
 
-    // [TODO] Always Enable, Report as limit: Use multiple booleans that represent what `VK_KHR_maintenance4` adds support for, instead of single bool; see description in https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_maintenance4.html
-    /* Maintenance4FeaturesKHR *//* VK_KHR_maintenance4 *//* MOVED TO Vulkan 1.3 Core */
-    bool maintenance4 = false;
-
     /* CoherentMemoryFeaturesAMD *//* VK_AMD_device_coherent_memory */
     bool deviceCoherentMemory = false;
 
@@ -1185,7 +1181,6 @@ struct SPhysicalDeviceFeatures
         if (performanceCounterQueryPools && !_rhs.performanceCounterQueryPools) return false;
         if (performanceCounterMultipleQueryPools && !_rhs.performanceCounterMultipleQueryPools) return false;
         if (pipelineExecutableInfo && !_rhs.pipelineExecutableInfo) return false;
-        if (maintenance4 && !_rhs.maintenance4) return false;
         if (deviceCoherentMemory && !_rhs.deviceCoherentMemory) return false;
         if (bufferMarkerAMD && !_rhs.bufferMarkerAMD) return false;
         if (!_rhs.swapchainMode.hasFlags(swapchainMode)) return false;

include/nbl/video/SPhysicalDeviceLimits.h

@@ -589,6 +589,10 @@ struct SPhysicalDeviceLimits
     /* ShaderSMBuiltinsFeaturesNV *//* VK_NV_shader_sm_builtins */
     bool shaderSMBuiltins = false;
 
+    // [TODO] MORE: Use multiple booleans that represent what `VK_KHR_maintenance4` adds support for, instead of single bool; see description in https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_maintenance4.html
+    /* VkPhysicalDeviceMaintenance4Features *//* VK_KHR_maintenance4 */
+    bool workgroupSizeFromSpecConstant = false;
+
     bool shaderSubgroupPartitioned = false; /* VK_NV_shader_subgroup_partitioned */
     bool gcnShader = false; /* VK_AMD_gcn_shader */
     bool gpuShaderHalfFloat = false; /* VK_AMD_gpu_shader_half_float */
@@ -876,6 +880,7 @@ struct SPhysicalDeviceLimits
         if (imageFootprint && !_rhs.imageFootprint) return false;
         if (texelBufferAlignment && !_rhs.texelBufferAlignment) return false;
         if (shaderSMBuiltins && !_rhs.shaderSMBuiltins) return false;
+        if (workgroupSizeFromSpecConstant && !_rhs.workgroupSizeFromSpecConstant) return false;
         if (shaderSubgroupPartitioned && !_rhs.shaderSubgroupPartitioned) return false;
         if (gcnShader && !_rhs.gcnShader) return false;
         if (gpuShaderHalfFloat && !_rhs.gpuShaderHalfFloat) return false;

src/nbl/video/CVulkanPhysicalDevice.h

@@ -1051,12 +1051,6 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
                 m_features.pipelineExecutableInfo = pipelineExecutablePropertiesFeatures.pipelineExecutableInfo;
             }
 
-            /* VkPhysicalDeviceMaintenance4Features */
-            if (isExtensionSupported(VK_KHR_MAINTENANCE_4_EXTENSION_NAME))
-            {
-                m_features.maintenance4 = maintenance4Features.maintenance4;
-            }
-
             /* VkPhysicalDeviceCoherentMemoryFeaturesAMD */
             if (isExtensionSupported(VK_AMD_DEVICE_COHERENT_MEMORY_EXTENSION_NAME))
             {
@@ -1141,6 +1135,11 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
                 m_properties.limits.shaderSMBuiltins = shaderSMBuiltinsFeatures.shaderSMBuiltins;
             }
 
+            if (isExtensionSupported(VK_KHR_MAINTENANCE_4_EXTENSION_NAME))
+            {
+                m_properties.limits.workgroupSizeFromSpecConstant = maintenance4Features.maintenance4;
+            }
+
             m_properties.limits.shaderSubgroupPartitioned = isExtensionSupported(VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME);
             m_properties.limits.gcnShader = isExtensionSupported(VK_AMD_GCN_SHADER_EXTENSION_NAME);
             m_properties.limits.gpuShaderHalfFloat = isExtensionSupported(VK_AMD_GPU_SHADER_HALF_FLOAT_EXTENSION_NAME);
@@ -1643,6 +1642,13 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
                 addFeatureToChain(&shaderSMBuiltinsFeatures);
             }
 
+            if (insertExtensionIfAvailable(VK_KHR_MAINTENANCE_4_EXTENSION_NAME))
+            {
+                // No Extension Requirements
+                maintenance4Features.maintenance4 = m_properties.limits.workgroupSizeFromSpecConstant;
+                addFeatureToChain(&maintenance4Features);
+            }
+
             insertExtensionIfAvailable(VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME); // No Extension Requirements
             insertExtensionIfAvailable(VK_AMD_GCN_SHADER_EXTENSION_NAME); // No Extension Requirements
             insertExtensionIfAvailable(VK_AMD_GPU_SHADER_HALF_FLOAT_EXTENSION_NAME); // No Extension Requirements
@@ -1661,6 +1667,8 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
             insertExtensionIfAvailable(VK_KHR_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME); // No Extension Requirements
             insertExtensionIfAvailable(VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME); // No Extension Requirements
             insertExtensionIfAvailable(VK_NV_VIEWPORT_SWIZZLE_EXTENSION_NAME); // No Extension Requirements
+
+
         }
 
         // B. FeaturesToEnable: add names to strings and structs to feature chain
@@ -2213,9 +2221,7 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
         }
 
         CHECK_VULKAN_EXTENTION_FOR_SINGLE_VAR_FEATURE(pipelineExecutableInfo, VK_KHR_PIPELINE_EXECUTABLE_PROPERTIES_EXTENSION_NAME, pipelineExecutablePropertiesFeatures);
-            
-        CHECK_VULKAN_EXTENTION_FOR_SINGLE_VAR_FEATURE(maintenance4, VK_KHR_MAINTENANCE_4_EXTENSION_NAME, maintenance4Features)
-            
+        
         CHECK_VULKAN_EXTENTION_FOR_SINGLE_VAR_FEATURE(deviceCoherentMemory, VK_AMD_DEVICE_COHERENT_MEMORY_EXTENSION_NAME, coherentMemoryFeatures);
 
         if (enabledFeatures.bufferMarkerAMD)