commit 0aae0d7ad535aedba34daea325269e419baead68
author Jonah Ryan-Davis <jonahr@google.com> Tue Jan 11 20:17:10 2022
committer Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Jan 15 17:44:14 2022
tree ea9c3576384a707f479d27c4e6212470c660ca71
parent 6601b8d2e923fbd6a7084845904712db1b92ced0

Update PrintSystemInfo with missing fields.

SystemInfo's PrintSystemInfo was out of date and missing some newer
fields.

Bug: angleproject:6888
Change-Id: Ia73065d60ec3fab6affe21b81398ffb2fe587e9b
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3379709
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>

src/gpu_info_util/SystemInfo.cpp

diff --git a/src/gpu_info_util/SystemInfo.cpp b/src/gpu_info_util/SystemInfo.cpp
index 369f721..ea9db73 100644
--- a/src/gpu_info_util/SystemInfo.cpp
+++ b/src/gpu_info_util/SystemInfo.cpp
@@ -298,7 +298,9 @@
         const auto &gpu = info.gpus[i];
 
         std::cout << "  " << i << " - " << VendorName(gpu.vendorId) << " device id: 0x" << std::hex
-                  << std::uppercase << gpu.deviceId << std::dec << "\n";
+                  << std::uppercase << gpu.deviceId << std::dec << ", revision id: 0x" << std::hex
+                  << std::uppercase << gpu.revisionId << std::dec << ", system device id: 0x"
+                  << std::hex << std::uppercase << gpu.systemDeviceId << std::dec << "\n";
         if (!gpu.driverVendor.empty())
         {
             std::cout << "       Driver Vendor: " << gpu.driverVendor << "\n";
@@ -311,6 +313,15 @@
         {
             std::cout << "       Driver Date: " << gpu.driverDate << "\n";
         }
+        if (gpu.detailedDriverVersion.major != 0 || gpu.detailedDriverVersion.minor != 0 ||
+            gpu.detailedDriverVersion.subMinor != 0 || gpu.detailedDriverVersion.patch != 0)
+        {
+            std::cout << "       Detailed Driver Version:\n"
+                      << "           major: " << gpu.detailedDriverVersion.major
+                      << "           minor: " << gpu.detailedDriverVersion.minor
+                      << "           subMinor: " << gpu.detailedDriverVersion.subMinor
+                      << "           patch: " << gpu.detailedDriverVersion.patch << "\n";
+        }
     }
 
     std::cout << "\n";
@@ -319,12 +330,18 @@
     std::cout << "\n";
     std::cout << "Optimus: " << (info.isOptimus ? "true" : "false") << "\n";
     std::cout << "AMD Switchable: " << (info.isAMDSwitchable ? "true" : "false") << "\n";
+    std::cout << "Mac Switchable: " << (info.isMacSwitchable ? "true" : "false") << "\n";
+    std::cout << "Needs EAGL on Mac: " << (info.needsEAGLOnMac ? "true" : "false") << "\n";
 
     std::cout << "\n";
     if (!info.machineManufacturer.empty())
     {
         std::cout << "Machine Manufacturer: " << info.machineManufacturer << "\n";
     }
+    if (info.androidSdkLevel != 0)
+    {
+        std::cout << "Android SDK Level: " << info.androidSdkLevel << "\n";
+    }
     if (!info.machineModelName.empty())
     {
         std::cout << "Machine Model: " << info.machineModelName << "\n";