Remove extra imageFootPrint and bake infinity value

nipunG314 · nipunG314 · commit afdddf324b89 · 2024-07-19T01:16:43.000+05:30
diff --git a/tools/deviceGen/DeviceGen.py b/tools/deviceGen/DeviceGen.py
@@ -259,14 +259,14 @@ def transformTraits(dict, line_format, json_type, line_format_params):
 
     if parsed_value == '0.5f-exp2f(-MinSubPixelInterpolationOffsetBits)':
         parsed_value = "0.4375"
-
+    
     if parsed_type.endswith('int8_t'):
         parsed_type = parsed_type[:-3] + "16_t"
 
     if parsed_type == "float" and parsed_name.find("Range") == -1 and parsed_name.find(r"[") == -1:
         parsed_type = "uint32_t"
         parsed_name += "BitPattern"
-        parsed_value = f"asuint({parsed_value})"
+        parsed_value = f"asuint({parsed_value})" if parsed_value != "nbl::hlsl::numeric_limits<float>::infinity" else "0x7F800000"
         parsed_json_type = r"std::bit_cast<uint32_t>(" + parsed_json_type
         parsed_cpp_name = parsed_cpp_name + r")"
 
diff --git a/tools/deviceGen/input/device_features.json b/tools/deviceGen/input/device_features.json
@@ -2445,7 +2445,7 @@
         },
         {
             "type": "bool",
-            "name": "imageFootPrint",
+            "name": "imageFootprint",
             "value": false,
             "expose": "MOVE_TO_LIMIT",
             "comment": [
diff --git a/tools/deviceGen/input/device_limits.json b/tools/deviceGen/input/device_limits.json
@@ -1830,15 +1830,6 @@
                 }
             ]
         },
-        {
-            "type": "bool",
-            "name": "imageFootprint",
-            "value": false,
-            "comment": [
-                "VK_NV_shader_image_footprint",
-                "ShaderImageFootprintFeaturesNV"
-            ]
-        },
         {
             "comment": [
                 "VK_EXT_pci_bus_info",
diff --git a/tools/deviceGen/output/SPhysicalDeviceFeatures_members.h b/tools/deviceGen/output/SPhysicalDeviceFeatures_members.h
@@ -999,7 +999,7 @@
     // [EXPOSE AS LIMIT] Enabled by Default, Moved to Limits
     // ShaderImageFootprintFeaturesNV
     // VK_NV_shader_image_footprint
-    // bool imageFootPrint = false;
+    // bool imageFootprint = false;
 
     // [TODO LATER] requires extra API work to use
     // GL Hint: in GL/GLES this is NV_scissor_exclusive
diff --git a/tools/deviceGen/output/SPhysicalDeviceLimits_members.h b/tools/deviceGen/output/SPhysicalDeviceLimits_members.h
@@ -429,10 +429,6 @@
     bool computeDerivativeGroupQuads = false;
     bool computeDerivativeGroupLinear = false;
 
-    // VK_NV_shader_image_footprint
-    // ShaderImageFootprintFeaturesNV
-    bool imageFootprint = false;
-
     // VK_EXT_pci_bus_info
     // PCIBusInfoPropertiesEXT
     uint32_t pciDomain = ~0u;
@@ -576,7 +572,7 @@
     bool shaderZeroInitializeWorkgroupMemory = false;
     bool shaderDeviceClock = false;
     bool shaderSubgroupClock = false;
-    bool imageFootPrint = false;
+    bool imageFootprint = false;
     bool shaderIntegerFunctions2 = false;
     bool shaderEarlyAndLateFragmentTests = false;
 
diff --git a/tools/deviceGen/output/SPhysicalDeviceLimits_subset.h b/tools/deviceGen/output/SPhysicalDeviceLimits_subset.h
@@ -309,8 +309,6 @@ if (maxSampleLocationGridSize.y > _rhs.maxSampleLocationGridSize.y) return false
     if (computeDerivativeGroupQuads && !_rhs.computeDerivativeGroupQuads) return false;
     if (computeDerivativeGroupLinear && !_rhs.computeDerivativeGroupLinear) return false;
 
-    if (imageFootprint && !_rhs.imageFootprint) return false;
-
     // if (pciDomain > _rhs.pciDomain) return false;
     // if (pciBus > _rhs.pciBus) return false;
     // if (pciDevice > _rhs.pciDevice) return false;
@@ -405,7 +403,7 @@ if (minFragmentDensityTexelSize.y < _rhs.minFragmentDensityTexelSize.y) return f
     if (shaderZeroInitializeWorkgroupMemory && !_rhs.shaderZeroInitializeWorkgroupMemory) return false;
     if (shaderDeviceClock && !_rhs.shaderDeviceClock) return false;
     if (shaderSubgroupClock && !_rhs.shaderSubgroupClock) return false;
-    if (imageFootPrint && !_rhs.imageFootPrint) return false;
+    if (imageFootprint && !_rhs.imageFootprint) return false;
     if (shaderIntegerFunctions2 && !_rhs.shaderIntegerFunctions2) return false;
     if (shaderEarlyAndLateFragmentTests && !_rhs.shaderEarlyAndLateFragmentTests) return false;
 
diff --git a/tools/deviceGen/output/device_capabilities_traits_defaults.hlsl b/tools/deviceGen/output/device_capabilities_traits_defaults.hlsl
@@ -266,7 +266,7 @@ NBL_GENERATE_GET_OR_DEFAULT(maxDiscardRectangles, uint32_t, 0);
 
 NBL_GENERATE_GET_OR_DEFAULT(primitiveOverestimationSizeBitPattern, uint32_t, asuint(0.f));
 NBL_GENERATE_GET_OR_DEFAULT(maxExtraPrimitiveOverestimationSizeBitPattern, uint32_t, asuint(0.f));
-NBL_GENERATE_GET_OR_DEFAULT(extraPrimitiveOverestimationSizeGranularityBitPattern, uint32_t, asuint(nbl::hlsl::numeric_limits<float>::infinity));
+NBL_GENERATE_GET_OR_DEFAULT(extraPrimitiveOverestimationSizeGranularityBitPattern, uint32_t, 0x7F800000);
 NBL_GENERATE_GET_OR_DEFAULT(primitiveUnderestimation, bool, false);
 NBL_GENERATE_GET_OR_DEFAULT(conservativePointAndLineRasterization, bool, false);
 NBL_GENERATE_GET_OR_DEFAULT(degenerateTrianglesRasterized, bool, false);
@@ -309,8 +309,6 @@ NBL_GENERATE_GET_OR_DEFAULT(postDepthCoverage, bool, false);
 NBL_GENERATE_GET_OR_DEFAULT(computeDerivativeGroupQuads, bool, false);
 NBL_GENERATE_GET_OR_DEFAULT(computeDerivativeGroupLinear, bool, false);
 
-NBL_GENERATE_GET_OR_DEFAULT(imageFootprint, bool, false);
-
 NBL_GENERATE_GET_OR_DEFAULT(pciDomain, uint32_t, ~0u);
 NBL_GENERATE_GET_OR_DEFAULT(pciBus, uint32_t, ~0u);
 NBL_GENERATE_GET_OR_DEFAULT(pciDevice, uint32_t, ~0u);
@@ -403,7 +401,7 @@ NBL_GENERATE_GET_OR_DEFAULT(shaderTerminateInvocation, bool, false);
 NBL_GENERATE_GET_OR_DEFAULT(shaderZeroInitializeWorkgroupMemory, bool, false);
 NBL_GENERATE_GET_OR_DEFAULT(shaderDeviceClock, bool, false);
 NBL_GENERATE_GET_OR_DEFAULT(shaderSubgroupClock, bool, false);
-NBL_GENERATE_GET_OR_DEFAULT(imageFootPrint, bool, false);
+NBL_GENERATE_GET_OR_DEFAULT(imageFootprint, bool, false);
 NBL_GENERATE_GET_OR_DEFAULT(shaderIntegerFunctions2, bool, false);
 NBL_GENERATE_GET_OR_DEFAULT(shaderEarlyAndLateFragmentTests, bool, false);
 
diff --git a/tools/deviceGen/output/device_capabilities_traits_jit.h b/tools/deviceGen/output/device_capabilities_traits_jit.h
@@ -301,8 +301,6 @@ NBL_CONSTEXPR_STATIC_INLINE bool postDepthCoverage = )===" + std::string("(bool)
 NBL_CONSTEXPR_STATIC_INLINE bool computeDerivativeGroupQuads = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.computeDerivativeGroupQuads) + R"===(;
 NBL_CONSTEXPR_STATIC_INLINE bool computeDerivativeGroupLinear = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.computeDerivativeGroupLinear) + R"===(;
 
-NBL_CONSTEXPR_STATIC_INLINE bool imageFootprint = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.imageFootprint) + R"===(;
-
 NBL_CONSTEXPR_STATIC_INLINE uint32_t pciDomain = )===" + std::string("(uint32_t)") + CJITIncludeLoader::to_string(limits.pciDomain) + R"===(;
 NBL_CONSTEXPR_STATIC_INLINE uint32_t pciBus = )===" + std::string("(uint32_t)") + CJITIncludeLoader::to_string(limits.pciBus) + R"===(;
 NBL_CONSTEXPR_STATIC_INLINE uint32_t pciDevice = )===" + std::string("(uint32_t)") + CJITIncludeLoader::to_string(limits.pciDevice) + R"===(;
@@ -395,7 +393,7 @@ NBL_CONSTEXPR_STATIC_INLINE bool shaderTerminateInvocation = )===" + std::string
 NBL_CONSTEXPR_STATIC_INLINE bool shaderZeroInitializeWorkgroupMemory = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.shaderZeroInitializeWorkgroupMemory) + R"===(;
 NBL_CONSTEXPR_STATIC_INLINE bool shaderDeviceClock = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.shaderDeviceClock) + R"===(;
 NBL_CONSTEXPR_STATIC_INLINE bool shaderSubgroupClock = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.shaderSubgroupClock) + R"===(;
-NBL_CONSTEXPR_STATIC_INLINE bool imageFootPrint = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.imageFootPrint) + R"===(;
+NBL_CONSTEXPR_STATIC_INLINE bool imageFootprint = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.imageFootprint) + R"===(;
 NBL_CONSTEXPR_STATIC_INLINE bool shaderIntegerFunctions2 = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.shaderIntegerFunctions2) + R"===(;
 NBL_CONSTEXPR_STATIC_INLINE bool shaderEarlyAndLateFragmentTests = )===" + std::string("(bool)") + CJITIncludeLoader::to_string(limits.shaderEarlyAndLateFragmentTests) + R"===(;
 
diff --git a/tools/deviceGen/output/device_capabilities_traits_members.hlsl b/tools/deviceGen/output/device_capabilities_traits_members.hlsl
@@ -300,8 +300,6 @@ NBL_CONSTEXPR_STATIC_INLINE bool postDepthCoverage = impl::get_or_default_postDe
 NBL_CONSTEXPR_STATIC_INLINE bool computeDerivativeGroupQuads = impl::get_or_default_computeDerivativeGroupQuads<device_capabilities>::value;
 NBL_CONSTEXPR_STATIC_INLINE bool computeDerivativeGroupLinear = impl::get_or_default_computeDerivativeGroupLinear<device_capabilities>::value;
 
-NBL_CONSTEXPR_STATIC_INLINE bool imageFootprint = impl::get_or_default_imageFootprint<device_capabilities>::value;
-
 NBL_CONSTEXPR_STATIC_INLINE uint32_t pciDomain = impl::get_or_default_pciDomain<device_capabilities>::value;
 NBL_CONSTEXPR_STATIC_INLINE uint32_t pciBus = impl::get_or_default_pciBus<device_capabilities>::value;
 NBL_CONSTEXPR_STATIC_INLINE uint32_t pciDevice = impl::get_or_default_pciDevice<device_capabilities>::value;
@@ -394,7 +392,7 @@ NBL_CONSTEXPR_STATIC_INLINE bool shaderTerminateInvocation = impl::get_or_defaul
 NBL_CONSTEXPR_STATIC_INLINE bool shaderZeroInitializeWorkgroupMemory = impl::get_or_default_shaderZeroInitializeWorkgroupMemory<device_capabilities>::value;
 NBL_CONSTEXPR_STATIC_INLINE bool shaderDeviceClock = impl::get_or_default_shaderDeviceClock<device_capabilities>::value;
 NBL_CONSTEXPR_STATIC_INLINE bool shaderSubgroupClock = impl::get_or_default_shaderSubgroupClock<device_capabilities>::value;
-NBL_CONSTEXPR_STATIC_INLINE bool imageFootPrint = impl::get_or_default_imageFootPrint<device_capabilities>::value;
+NBL_CONSTEXPR_STATIC_INLINE bool imageFootprint = impl::get_or_default_imageFootprint<device_capabilities>::value;
 NBL_CONSTEXPR_STATIC_INLINE bool shaderIntegerFunctions2 = impl::get_or_default_shaderIntegerFunctions2<device_capabilities>::value;
 NBL_CONSTEXPR_STATIC_INLINE bool shaderEarlyAndLateFragmentTests = impl::get_or_default_shaderEarlyAndLateFragmentTests<device_capabilities>::value;
 
diff --git a/tools/deviceGen/output/device_capabilities_traits_testers.hlsl b/tools/deviceGen/output/device_capabilities_traits_testers.hlsl
@@ -300,8 +300,6 @@ NBL_GENERATE_MEMBER_TESTER(postDepthCoverage);
 NBL_GENERATE_MEMBER_TESTER(computeDerivativeGroupQuads);
 NBL_GENERATE_MEMBER_TESTER(computeDerivativeGroupLinear);
 
-NBL_GENERATE_MEMBER_TESTER(imageFootprint);
-
 NBL_GENERATE_MEMBER_TESTER(pciDomain);
 NBL_GENERATE_MEMBER_TESTER(pciBus);
 NBL_GENERATE_MEMBER_TESTER(pciDevice);
@@ -394,7 +392,7 @@ NBL_GENERATE_MEMBER_TESTER(shaderTerminateInvocation);
 NBL_GENERATE_MEMBER_TESTER(shaderZeroInitializeWorkgroupMemory);
 NBL_GENERATE_MEMBER_TESTER(shaderDeviceClock);
 NBL_GENERATE_MEMBER_TESTER(shaderSubgroupClock);
-NBL_GENERATE_MEMBER_TESTER(imageFootPrint);
+NBL_GENERATE_MEMBER_TESTER(imageFootprint);
 NBL_GENERATE_MEMBER_TESTER(shaderIntegerFunctions2);
 NBL_GENERATE_MEMBER_TESTER(shaderEarlyAndLateFragmentTests);
 

Original file line number	Diff line number	Diff line change
`@@ -2445,7 +2445,7 @@`
`2445`	`2445`	`},`
`2446`	`2446`	`{`
`2447`	`2447`	`"type": "bool",`
`2448`		`- "name": "imageFootPrint",`
	`2448`	`+ "name": "imageFootprint",`
`2449`	`2449`	`"value": false,`
`2450`	`2450`	`"expose": "MOVE_TO_LIMIT",`
`2451`	`2451`	`"comment": [`
Original file line number	Diff line number	Diff line change
`@@ -1830,15 +1830,6 @@`
`1830`	`1830`	`}`
`1831`	`1831`	`]`
`1832`	`1832`	`},`
`1833`		`- {`
`1834`		`- "type": "bool",`
`1835`		`- "name": "imageFootprint",`
`1836`		`- "value": false,`
`1837`		`- "comment": [`
`1838`		`- "VK_NV_shader_image_footprint",`
`1839`		`- "ShaderImageFootprintFeaturesNV"`
`1840`		`- ]`
`1841`		`- },`
`1842`	`1833`	`{`
`1843`	`1834`	`"comment": [`
`1844`	`1835`	`"VK_EXT_pci_bus_info",`