Fixed some illogical reordering, added more tooltips

Author: Devaniti

source/frontend/assets/js/feature_table_constants.mjs

@@ -24,14 +24,14 @@ export const TableFeaturesShortNames = {
     "D3D12_FEATURE_DATA_D3D12_OPTIONS16.GPUUploadHeapSupported": "GPU upload heaps",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS12.EnhancedBarriersSupported": "Enhanced barriers",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS6.VariableShadingRateTier": "Variable-rate shading",
-    "D3D12_FEATURE_DATA_D3D12_OPTIONS6.ShadingRateImageTileSize": "Shading-rate image tile size",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS6.AdditionalShadingRatesSupported": "Additional shading rates",
-    "D3D12_FEATURE_DATA_D3D12_OPTIONS10.VariableRateShadingSumCombinerSupported": "VRS sum combiner",
+    "D3D12_FEATURE_DATA_D3D12_OPTIONS6.ShadingRateImageTileSize": "Shading-rate image tile size",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS6.PerPrimitiveShadingRateSupportedWithViewportIndexing": "Per-primitive shading rate with viewport indexing",
+    "D3D12_FEATURE_DATA_D3D12_OPTIONS10.VariableRateShadingSumCombinerSupported": "VRS sum combiner",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS10.MeshShaderPerPrimitiveShadingRateSupported": "Mesh shader per-primitive shading rate",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS3.BarycentricsSupported": "Barycentrics",
-    "R9G9B9E5_RTV_UAV": "R9G9B9E5 RTV/UAV support",
-    "R9G9B9E5_Display": "R9G9B9E5 Display support",
+    "Table_R9G9B9E5_RTV_UAV": "R9G9B9E5 RTV/UAV support",
+    "Table_R9G9B9E5_Display": "R9G9B9E5 Display support",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS9.WaveMMATier": "WaveMMA (wave_matrix)",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS1.WaveLaneCountMin": "Wave lane count min",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS1.WaveLaneCountMax": "Wave lane count max",
@@ -43,10 +43,10 @@ export const TableFeaturesShortNames = {
     "D3D12_FEATURE_DATA_D3D12_OPTIONS.ResourceHeapTier": "Resource heap",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS.ResourceBindingTier": "Resource binding",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS.TiledResourcesTier": "Tiled resources",
-    "D3D12_FEATURE_DATA_D3D12_OPTIONS.MinPrecisionSupport": "Min-precision support",
-    "D3D12_FEATURE_DATA_D3D12_OPTIONS4.Native16BitShaderOpsSupported": "Native 16-bit shader ops",
     // This is supposed to mean that tier 3 is only supported for SRVs, but unfortunately is always true when fully-featured tier 3 is reported, we fix that up later
     "D3D12_FEATURE_DATA_D3D12_OPTIONS5.SRVOnlyTiledResourceTier3": "SRV-only tiled resource tier 3",
+    "D3D12_FEATURE_DATA_D3D12_OPTIONS.MinPrecisionSupport": "Min-precision support",
+    "D3D12_FEATURE_DATA_D3D12_OPTIONS4.Native16BitShaderOpsSupported": "Native 16-bit shader ops",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS.DoublePrecisionFloatShaderOps": "64-bit float shader ops",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS1.Int64ShaderOps": "64-bit int shader ops",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS9.AtomicInt64OnTypedResourceSupported": "64-bit int atomics on typed resource",
@@ -96,29 +96,27 @@ export const TableFeaturesShortNames = {
     "D3D12_FEATURE_DATA_D3D12_OPTIONS.CrossAdapterRowMajorTextureSupported": "Cross-adapter row-major textures",
 
     // Features that are consistent across all GPUs of last 10 years
+    "D3D12_FEATURE_DATA_CROSS_NODE.SharingTier": "Cross-node sharing",
+    "D3D12_FEATURE_DATA_CROSS_NODE.AtomicShaderInstructions": "Cross-node atomics",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS1.WaveOps": "Wave ops",
-    "D3D12_FEATURE_DATA_ROOT_SIGNATURE.HighestVersion": "Root signature version",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS.OutputMergerLogicOp": "Output merger logic ops",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS3.CastingFullyTypedFormatSupported": "Casting fully typed formats",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS.TypedUAVLoadAdditionalFormats": "Typed UAV loads for additional formats",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation": "VP & RT array index without GS emulation",
-
     "D3D12_FEATURE_DATA_D3D12_OPTIONS4.MSAA64KBAlignedTextureSupported": "64KB-aligned MSAA textures",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS4.SharedResourceCompatibilityTier": "Shared resources compatibility",
-
     "D3D12_FEATURE_DATA_D3D12_OPTIONS9.MeshShaderPipelineStatsSupported": "Mesh shader pipeline stats",
-    "D3D12_FEATURE_DATA_CROSS_NODE.SharingTier": "Cross-node sharing",
 
     // Features that seem to only be used for debugging
     "D3D12_FEATURE_DATA_EXISTING_HEAPS.Supported": "Heaps from existing memory",
-    "D3D12_FEATURE_DATA_CROSS_NODE.AtomicShaderInstructions": "Cross-node atomics",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS20.RecreateAtTier": "Recreate resource at pointer",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS20.ComputeOnlyWriteWatchSupported": "Compute-only write watch",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS19.ComputeOnlyCustomHeapSupported": "Compute-only custom heap",
 
     // Things that literally can not be unsupported given new enough Agility SDK/OS
     "D3D12_FEATURE_DATA_D3D12_OPTIONS19.RasterizerDesc2Supported": "RASTERIZER_DESC2 supported",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS18.RenderPassesValid" : "Render passes valid",
+    "D3D12_FEATURE_DATA_ROOT_SIGNATURE.HighestVersion": "Root signature version",
     "D3D12_FEATURE_DATA_D3D12_OPTIONS1.ExpandedComputeResourceStates" : "Expanded compute resource states",
 
     // Not in retail yet

source/frontend/assets/js/website_feature_table.mjs

@@ -1,10 +1,10 @@
-import * as Server from './server.mjs'
-import * as Properties from './properties.mjs'
+import ArchStats from './arch_stats.mjs'
 import * as Constants from './constants.mjs'
 import * as FeatureTableConstants from './feature_table_constants.mjs'
-import * as HTML from './html.mjs'
-import ArchStats from './arch_stats.mjs'
 import Globals from './globals.mjs'
+import * as HTML from './html.mjs'
+import * as Properties from './properties.mjs'
+import * as Server from './server.mjs'
 
 let Reports = [];
 
@@ -704,7 +704,7 @@ function AddSpecialRowCell(featureRow, archName, featureName) {
         featureRow.appendChild(td);
         return true;
     }
-    else if (featureName == "R9G9B9E5_RTV_UAV") {
+    else if (featureName == "Table_R9G9B9E5_RTV_UAV") {
         let newestDriverReport = NewestDriverReportPerArch.get(archName);
         if (newestDriverReport.Formats == null) {
             AddCellReal("❓", featureRow);
@@ -722,7 +722,7 @@ function AddSpecialRowCell(featureRow, archName, featureName) {
         AddCellReal(rtvSupport ? FeatureTableConstants.TableTrueFalseMapping["1"] : FeatureTableConstants.TableTrueFalseMapping["0"], featureRow);
         return true;
     }
-    else if (featureName == "R9G9B9E5_Display") {
+    else if (featureName == "Table_R9G9B9E5_Display") {
         let newestDriverReport = NewestDriverReportPerArch.get(archName);
         if (newestDriverReport.Formats == null) {
             AddCellReal("❓", featureRow);
@@ -749,12 +749,34 @@ function AddSpecialRowCell(featureRow, archName, featureName) {
 
 function OverrideCell(tableRow, archName, featureName, featureValue, newestDriverReport, newestReportContainer) {
     if (featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS16.GPUUploadHeapSupported") {
+        if (archName == "WARP")
+        {
+            // WARP just supports it without any special conditions
+            AddCellReal(FeatureTableConstants.TableTrueFalseMapping["1"], tableRow);
+            return true;
+        }
         for (let r of ReportsPerArch.get(archName)) {
+            // If at least one report has GPUUploadHeapSupported == 1, this means that architecture supports it
             if (archName != "WARP" && r.D3D12_FEATURE_DATA_D3D12_OPTIONS16.GPUUploadHeapSupported) {
-                AddCellReal("✅*", tableRow, "GPU Upload Heap support depends on BIOS settings and Windows version.\nSame GPU may report different values depending on the system.", "bottomright");
+                AddCellReal(FeatureTableConstants.TableTrueFalseMapping["1"] + "*", tableRow, "GPU Upload Heap support depends on BIOS settings and Windows version.\nSame GPU may report different values depending on the system.", "bottomright");
                 return true;
             }
         }
+        // If no report has GPUUploadHeapSupported == 1, we assume that the architecture doesn't support it
+        AddCellReal(FeatureTableConstants.TableTrueFalseMapping["0"], tableRow);
+        return true;
+    }
+    else if ((featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS6.ShadingRateImageTileSize" || featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS6.AdditionalShadingRatesSupported" || featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS6.PerPrimitiveShadingRateSupportedWithViewportIndexing" || featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS10.VariableRateShadingSumCombinerSupported" || featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS10.MeshShaderPerPrimitiveShadingRateSupported") && newestDriverReport.D3D12_FEATURE_DATA_D3D12_OPTIONS6.VariableShadingRateTier == 0) {
+        AddCellReal("N/A", tableRow, "VRS capabilities are only relevant if VRS is supported.");
+        return true;
+    }
+    else if (featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS6.ShadingRateImageTileSize" && newestDriverReport.D3D12_FEATURE_DATA_D3D12_OPTIONS6.VariableShadingRateTier == 1) {
+        AddCellReal("N/A", tableRow, "VRS Tier 2 is required for shading rate image support.");
+        return true;
+    }
+    else if ((featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS6.PerPrimitiveShadingRateSupportedWithViewportIndexing" || featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS10.VariableRateShadingSumCombinerSupported" || featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS10.MeshShaderPerPrimitiveShadingRateSupported") && newestDriverReport.D3D12_FEATURE_DATA_D3D12_OPTIONS6.VariableShadingRateTier == 1) {
+        AddCellReal("N/A", tableRow, "VRS Tier 2 is required for this capability.");
+        return true;
     }
     // If our tiled resource tier is 3, the SRVOnlyTiledResourceTier3 flag does not apply, but is always true, which is misleading
     else if (featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS5.SRVOnlyTiledResourceTier3" && newestDriverReport.D3D12_FEATURE_DATA_D3D12_OPTIONS.TiledResourcesTier >= 3) {
@@ -769,10 +791,18 @@ function OverrideCell(tableRow, archName, featureName, featureValue, newestDrive
         AddCellReal("Tier 1.1 *", tableRow, "Within Turing architecture there are:\nRTX 20 series and Quadro RTX cards with hardware Tier 1.1 support\nGTX 16 series cards with >= 6GB of VRAM with software emulated Tier 1.0 support\nGTX 16 series cards with < 6GB of VRAM with no raytracing support at all");
         return true;
     }
+    else if (featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS5.RaytracingTier" && archName == "X1") {
+        AddCellReal("❌ *", tableRow, "X1 supports ray query in hardware,\nbut this capability is not exposed in D3D12,\nsince DXR Tier 1.0 requires callable shaders,\nwhich are unsupported on X1.", "bottomright");
+        return true;
+    }
     else if (featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS7.MeshShaderTier" && archName == "RDNA2") {
         AddCellReal(FeatureTableConstants.TableTrueFalseMapping["1"] + "*", tableRow, "RDNA2 iGPUs with 1 WGP don't have mesh shader support");
         return true;
     }
+    else if (featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS12.MSPrimitivesPipelineStatisticIncludesCulledPrimitives" && newestDriverReport.D3D12_FEATURE_DATA_D3D12_OPTIONS7.MeshShaderTier == 0) {
+        AddCellReal("N/A", tableRow, "It is only relevant if Mesh Shaders are supported.", "bottomright");
+        return true;
+    }
     return false;
 }
 
@@ -795,11 +825,16 @@ function AddCell(featureRow, archName, featureName) {
 
 function AddSpecialRow(featureRow, featureName) {
     if (featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS19.RasterizerDesc2Supported" || featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS18.RenderPassesValid") {
-        AddCellReal("Always supported", featureRow, "Given new enough Agility SDK, it is always supported, independently of GPU or driver.", "topcenter", ArchToOutputCount());
+        // I don't know why, but both D3D12_FEATURE_DATA_D3D12_OPTIONS18 and D3D12_FEATURE_DATA_D3D12_OPTIONS19 were added in the same SDK version
+        AddCellReal("Always supported *", featureRow, "Starting with Agility SDK 1.610.0, it is always supported, independently of GPU or driver.", "topcenter", ArchToOutputCount());
+        return true;
+    }
+    if (featureName == "D3D12_FEATURE_DATA_ROOT_SIGNATURE.HighestVersion") {
+        AddCellReal("1.2 *", featureRow, "Starting with Agility SDK 1.610.0, root signature 1.2 is always supported, independently of GPU or driver.", "topcenter", ArchToOutputCount());
         return true;
     }
     if (featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS1.ExpandedComputeResourceStates") {
-        AddCellReal("Always supported", featureRow, "Given new enough OS, it is always supported, independently of GPU or driver.", "topcenter", ArchToOutputCount());
+        AddCellReal("Always supported *", featureRow, "Starting with Windows 10 version 1607, it is always supported, independently of GPU or driver.\nAll currently supported Windows versions are newer than Windows 10 version 1607.", "topcenter", ArchToOutputCount());
         return true;
     }
 
@@ -831,7 +866,7 @@ function AddRow(tbody, featureName, featureShortName) {
     if (!featureName.startsWith("Table"))
         AddTooltipForTable(featureHeader, featureName, { alignOutsideVertical: true });
     else if (featureName == "TableMarketShare")
-        AddTooltipForTable(featureHeader, "Market share in the Steam Hardware Survey among DirectX 12 System. This is an underestimate and may not be very accurate in general.", { alignOutsideVertical: true });
+        AddTooltipForTable(featureHeader, "Market share in the Steam Hardware Survey among DirectX 12 Systems.\nThis is an underestimate and may not be very accurate in general.", { alignOutsideVertical: true });
 
     featureRow.appendChild(featureHeader);