Merge pull request #846 from Devsh-Graphics-Programming/revert-some-device-limits

video: Revert some device limit changes from #829

Author: devshgraphicsprogramming

src/nbl/video/CVulkanPhysicalDevice.cpp

@@ -401,16 +401,22 @@ std::unique_ptr<CVulkanPhysicalDevice> CVulkanPhysicalDevice::create(core::smart
         //vulkan12Properties.denormBehaviorIndependence;
         //vulkan12Properties.denormBehaviorIndependence;
 
+	//! preserve of 16bit float checked later when features are known
         if (!vulkan12Properties.shaderSignedZeroInfNanPreserveFloat32)
             return nullptr;
-        if (!vulkan12Properties.shaderDenormPreserveFloat32)
-            return nullptr;
-        if (!vulkan12Properties.shaderDenormFlushToZeroFloat32)
-            return nullptr;
-        if (!vulkan12Properties.shaderRoundingModeRTEFloat32)
-            return nullptr;
-        if (!vulkan12Properties.shaderRoundingModeRTZFloat32)
-            return nullptr;
+        properties.limits.shaderSignedZeroInfNanPreserveFloat64 = vulkan12Properties.shaderSignedZeroInfNanPreserveFloat64;
+        properties.limits.shaderDenormPreserveFloat16 = vulkan12Properties.shaderDenormPreserveFloat16;
+        properties.limits.shaderDenormPreserveFloat32 = vulkan12Properties.shaderDenormPreserveFloat32;
+        properties.limits.shaderDenormPreserveFloat64 = vulkan12Properties.shaderDenormPreserveFloat64;
+        properties.limits.shaderDenormFlushToZeroFloat16 = vulkan12Properties.shaderDenormFlushToZeroFloat16;
+        properties.limits.shaderDenormFlushToZeroFloat32 = vulkan12Properties.shaderDenormFlushToZeroFloat32;
+        properties.limits.shaderDenormFlushToZeroFloat64 = vulkan12Properties.shaderDenormFlushToZeroFloat64;
+        properties.limits.shaderRoundingModeRTEFloat16 = vulkan12Properties.shaderRoundingModeRTEFloat16;
+        properties.limits.shaderRoundingModeRTEFloat32 = vulkan12Properties.shaderRoundingModeRTEFloat32;
+        properties.limits.shaderRoundingModeRTEFloat64 = vulkan12Properties.shaderRoundingModeRTEFloat64;
+        properties.limits.shaderRoundingModeRTZFloat16 = vulkan12Properties.shaderRoundingModeRTZFloat16;
+        properties.limits.shaderRoundingModeRTZFloat32 = vulkan12Properties.shaderRoundingModeRTZFloat32;
+        properties.limits.shaderRoundingModeRTZFloat64 = vulkan12Properties.shaderRoundingModeRTZFloat64;
 
         // descriptor indexing
         properties.limits.maxUpdateAfterBindDescriptorsInAllPools                 = vulkan12Properties.maxUpdateAfterBindDescriptorsInAllPools;
@@ -898,34 +904,15 @@ std::unique_ptr<CVulkanPhysicalDevice> CVulkanPhysicalDevice::create(core::smart
         properties.limits.shaderSharedInt64Atomics = vulkan12Features.shaderSharedInt64Atomics;
 
         properties.limits.shaderFloat16 = vulkan12Features.shaderFloat16;
+	if (!vulkan12Features.shaderFloat16)
+	{
+		// only fail if 16bit floats can be used
+		if (!vulkan12Properties.shaderSignedZeroInfNanPreserveFloat16)
+		    return nullptr;
+	}
+	    
         if (!vulkan12Features.shaderInt8)
             return nullptr;
-
-        if (properties.limits.shaderFloat16) {
-            if (!vulkan12Properties.shaderSignedZeroInfNanPreserveFloat16)
-                return nullptr;
-            if (!vulkan12Properties.shaderDenormPreserveFloat16)
-                return nullptr;
-            if (!vulkan12Properties.shaderDenormFlushToZeroFloat16)
-                return nullptr;
-            if (!vulkan12Properties.shaderRoundingModeRTEFloat16)
-                return nullptr;
-            if (!vulkan12Properties.shaderRoundingModeRTZFloat16)
-                return nullptr;
-        }
-
-        if (properties.limits.shaderFloat64) {
-            if (!vulkan12Properties.shaderSignedZeroInfNanPreserveFloat64)
-                return nullptr;
-            if (!vulkan12Properties.shaderDenormPreserveFloat64)
-                return nullptr;
-            if (!vulkan12Properties.shaderDenormFlushToZeroFloat64)
-                return nullptr;
-            if (!vulkan12Properties.shaderRoundingModeRTEFloat64)
-                return nullptr;
-            if (!vulkan12Properties.shaderRoundingModeRTZFloat64)
-                return nullptr;
-        }
 
         if (!vulkan12Features.descriptorIndexing)
             return nullptr;
@@ -1918,4 +1905,4 @@ core::smart_refctd_ptr<ILogicalDevice> CVulkanPhysicalDevice::createLogicalDevic
     return core::make_smart_refctd_ptr<CVulkanLogicalDevice>(core::smart_refctd_ptr<const IAPIConnection>(m_initData.api),m_rdoc_api,this,vk_device,params);
 }
 
-}
+}

src/nbl/video/device_capabilities/device_limits.json

@@ -915,80 +915,69 @@
                 {
                     "type": "bool",
                     "name": "shaderSignedZeroInfNanPreserveFloat64",
-                    "value": false,
-                    "expose": "DISABLE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderDenormPreserveFloat16",
-                    "value": false,
-                    "expose": "DISABLE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderDenormPreserveFloat32",
-                    "value": true,
-                    "expose": "REQUIRE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderDenormPreserveFloat64",
-                    "value": false,
-                    "expose": "DISABLE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderDenormFlushToZeroFloat16",
-                    "value": false,
-                    "expose": "DISABLE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderDenormFlushToZeroFloat32",
-                    "value": true,
-                    "expose": "REQUIRE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderDenormFlushToZeroFloat64",
-                    "value": false,
-                    "expose": "DISABLE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderRoundingModeRTEFloat16",
                     "value": false,
-                    "expose": "DISABLE"
+                    "comment": ["ROADMAP2024 but no good support yet"]
                 },
                 {
                     "type": "bool",
                     "name": "shaderRoundingModeRTEFloat32",
-                    "value": true,
-                    "expose": "REQUIRE"
+                    "value": false,
+                    "comment": ["ROADMAP2024 but no good support yet"]
                 },
                 {
                     "type": "bool",
                     "name": "shaderRoundingModeRTEFloat64",
-                    "value": false,
-                    "expose": "DISABLE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderRoundingModeRTZFloat16",
-                    "value": false,
-                    "expose": "DISABLE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderRoundingModeRTZFloat32",
-                    "value": true,
-                    "expose": "REQUIRE"
+                    "value": false
                 },
                 {
                     "type": "bool",
                     "name": "shaderRoundingModeRTZFloat64",
-                    "value": false,
-                    "expose": "DISABLE"
+                    "value": false
                 }
             ]
         },