@@ -604,16 +604,17 @@ function SpliceReportByArchAndVendor(reportContainer) {
604604 "RDNA" , ///< AMD RDNA architecture
605605 "RDNA2" , ///< AMD RDNA2 architecture
606606 "RDNA3" , ///< AMD RDNA3 architecture
607+ "RDNA4" , ///< AMD RDNA4 architecture
607608 ] ;
608609 // TODO: unknown asic reports could be assigned by device ID lists
609610 if ( report . AGSDeviceInfo . asicFamily != 0 ) {
610611 arch = AMDArchitectures [ report . AGSDeviceInfo . asicFamily ] ;
611612
612- // filter out RDNA2 iGPUs with 1 WGP because those don't support mesh shaders unlike all the others (TODO: should we handle this differently?)
613- if ( arch == "RDNA2" && report . AGSDeviceInfo . numWGPs == 1 && report . D3D12_FEATURE_DATA_D3D12_OPTIONS7 . MeshShaderTier == 0 )
614- return ;
613+ if ( ! arch ) {
614+ arch = "Arch ID " + report . AGSDeviceInfo . asicFamily ;
615+ }
615616
616- if ( arch ) ArchsPerVendor . AMD . add ( arch ) ;
617+ ArchsPerVendor . AMD . add ( arch ) ;
617618 }
618619 }
619620 else if ( vendorId . startsWith ( "Intel" ) ) {
@@ -687,31 +688,29 @@ function SpliceReportByArchAndVendor(reportContainer) {
687688 }
688689 arch = GetKeyByValue ( NvidiaArchitectures , report . NvPhysicalGpuHandle [ "NvAPI_GPU_GetArchInfo - NV_GPU_ARCH_INFO::architecture_id" ] ) ;
689690
690- // filter variants except Maxwell, should have same D3D12 features (though not CUDA features)
691- if ( arch ) {
692- if ( arch == "Kepler2" || arch == "Kepler1" )
693- arch = "Kepler" ;
694- else if ( arch == "Fermi1" )
695- arch = "Fermi" ; // unconfirmed
696- else if ( arch == "Volta1" )
697- arch = "Volta" ; // unconfirmed
698- else if ( arch == "Turing" ) { // differentiate between Turing 16 (no RT) and Turing 20 (RTX)
699- let codename = report . NvPhysicalGpuHandle [ "NvAPI_GPU_GetArchInfo - NV_GPU_ARCH_INFO::implementation_id" ] ;
700- if ( codename == 360 || codename == 359 || report . DXGI_ADAPTER_DESC3 . Description . includes ( "GTX 16" ) ) // TU116/117 or TU106 with RT disabled
701- arch = "Turing 16" ;
702- else
703- arch = "Turing 20" ;
704- }
691+ if ( ! arch ) {
692+ arch = "Arch ID " + report . NvPhysicalGpuHandle [ "NvAPI_GPU_GetArchInfo - NV_GPU_ARCH_INFO::architecture_id" ] ;
705693 }
706694
695+ // filter variants except Maxwell, should have same D3D12 features (though not CUDA features)
696+ if ( arch == "Kepler2" || arch == "Kepler1" )
697+ arch = "Kepler" ;
698+ else if ( arch == "Fermi1" )
699+ arch = "Fermi" ; // unconfirmed
700+ else if ( arch == "Volta1" )
701+ arch = "Volta" ; // unconfirmed
702+
707703 ArchsPerVendor . Nvidia . add ( arch ? arch : report . NvPhysicalGpuHandle [ "NvAPI_GPU_GetArchInfo - NV_GPU_ARCH_INFO::architecture_id" ] . toString ( ) ) ;
708704 }
709705 else if ( vendorId . startsWith ( "Qualcomm" ) ) {
710706
711707 if ( / S n a p d r a g o n \( R \) X ( P l u s ) | ( E l i t e ) - X 1 .* / . test ( report . DXGI_ADAPTER_DESC3 . Description ) )
712708 arch = "X1" ;
713709 else if ( report . DXGI_ADAPTER_DESC3 . Description . includes ( "8cx" ) )
710+ {
714711 arch = report . DXGI_ADAPTER_DESC3 . Description . slice ( report . DXGI_ADAPTER_DESC3 . Description . search ( / 8 c x .* / ) ) ;
712+ arch = arch . replace ( "Gen " , "" ) ;
713+ }
715714
716715 if ( arch ) ArchsPerVendor . Qualcomm . add ( arch ) ;
717716 }
@@ -742,12 +741,23 @@ function IsReportNewer(lhs, rhs) {
742741 return lhs . ID > rhs . ID ;
743742}
744743
744+ function FeatureTableFilter ( report ) {
745+ if ( report . GetField ( "Header.Using preview Agility SDK" ) )
746+ return true ;
747+
748+ // filter out RDNA2 iGPUs with 1 WGP since they don't have mesh shaders unlike all other RDNA2 GPUs
749+ if ( report . GetField ( "AGSDeviceInfo.asicFamily" ) == 8 && report . GetField ( "AGSDeviceInfo.numWGPs" ) == 1 && report . GetField ( "D3D12_FEATURE_DATA_D3D12_OPTIONS7.MeshShaderTier" ) == 0 )
750+ return true ;
751+
752+ return false ;
753+ }
754+
745755function PrepareReportsForTable ( ) {
746756
747757 ClearTableReportData ( ) ;
748758
749759 for ( let report of Reports ) {
750- if ( ! report . GetField ( "Header.Using preview Agility SDK" ) )
760+ if ( ! FeatureTableFilter ( report ) )
751761 SpliceReportByArchAndVendor ( report ) ;
752762 }
753763
@@ -900,7 +910,7 @@ function UpdateTableHeader(table) {
900910 {
901911 alignOutsideVertical : true ,
902912 preferTowardsBottom : true ,
903- tooltipAlignment : "bottom "
913+ tooltipAlignment : "bottomright "
904914 } ) ;
905915 }
906916 }
@@ -941,8 +951,14 @@ function UpdateTableBody(table) {
941951 else if ( featureName == "TableMarketShare" ) {
942952 let td = document . createElement ( "td" ) ;
943953 let marketShare = ArchStats [ archName ] ;
954+ let tooltipText ;
944955
945- if ( marketShare == undefined )
956+ if ( archName == "WARP" )
957+ {
958+ marketShare = "N/A"
959+ tooltipText = "WARP is a software rasterizer, not a hardware GPU, so it doesn't have a market share and not in Steam Hardware Survey." ;
960+ }
961+ else if ( marketShare == undefined )
946962 {
947963 marketShare = "~0%"
948964 }
@@ -952,6 +968,8 @@ function UpdateTableBody(table) {
952968 }
953969 td . append ( marketShare )
954970 featureRow . appendChild ( td )
971+ if ( tooltipText )
972+ AddTooltipForTable ( td , tooltipText , { alignOutsideVertical : true , tooltipAlignment : "bottomleft" } ) ;
955973 }
956974 else if ( featureName == "TableReportUsed" ) {
957975 let td = document . createElement ( "td" ) ;
@@ -985,7 +1003,6 @@ function UpdateTableBody(table) {
9851003 if ( featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS21.WorkGraphsTier" && featureValue == undefined ) {
9861004 featureValue = newestReportContainer . GetField ( "D3D12_FEATURE_DATA_D3D12_OPTIONS_EXPERIMENTAL.WorkGraphsTier" ) ;
9871005 }
988-
9891006 // GPU Upload Heap support depends on BIOS settings / Windows version, so if any report is true we take that one
9901007 else if ( featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS16.GPUUploadHeapSupported" ) {
9911008 for ( let r of ReportsPerArch . get ( archName ) ) {
@@ -995,16 +1012,25 @@ function UpdateTableBody(table) {
9951012 }
9961013 }
9971014 }
998-
9991015 // If our tiled resource tier is 3, the SRVOnlyTiledResourceTier3 flag does not apply, but is always true, which is misleading
10001016 else if ( featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS5.SRVOnlyTiledResourceTier3" && newestDriverReport . D3D12_FEATURE_DATA_D3D12_OPTIONS . TiledResourcesTier >= 3 ) {
10011017 featureValue = "N/A" ;
10021018 displayRawFeatureValue = true ;
10031019 }
1004- else if ( featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS5.RaytracingTier" && ( archName == "Pascal" || archName == "Turing 16" ) ) {
1005- featureValue = TableTrueFalseMapping [ "1" ] + "/" + TableTrueFalseMapping [ "0" ] ;
1020+ else if ( featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS5.RaytracingTier" && archName == "Pascal" ) {
1021+ featureValue = "Tier 1.0 *" ;
1022+ displayRawFeatureValue = true ;
1023+ tooltipText = "Pascal have (software emulated) Tier 1.0 raytracing support, but only if the card has 6GB of VRAM or more" ;
1024+ }
1025+ else if ( featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS5.RaytracingTier" && archName == "Turing" ) {
1026+ featureValue = "Tier 1.1 *" ;
1027+ displayRawFeatureValue = true ;
1028+ tooltipText = "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" ;
1029+ }
1030+ else if ( featureName == "D3D12_FEATURE_DATA_D3D12_OPTIONS7.MeshShaderTier" && archName == "RDNA2" ) {
1031+ featureValue = TableTrueFalseMapping [ "1" ] + "*" ;
10061032 displayRawFeatureValue = true ;
1007- tooltipText = "Pascal and Turing 16 have (software emulated) Tier 1.0 raytracing support, but only if the card has 6GB VRAM or more " ;
1033+ tooltipText = "RDNA2 iGPUs with 1 WGP don't have mesh shader support " ;
10081034 }
10091035 let td = document . createElement ( "td" ) ;
10101036 td . append ( displayRawFeatureValue ? featureValue : MakeHumanReadableForTable ( featureName , featureValue ) ) ;
0 commit comments