Add Broadcom as a known vendor

AUTHORS

@@ -32,6 +32,7 @@ IBM Inc.
 AdaptVis GmbH
 Samsung Electronics, Inc.
 Arm Ltd.
+Broadcom Inc.
 
 Jacek Caban
 Mark Callow

CONTRIBUTORS

@@ -167,3 +167,6 @@ Arm Ltd.
  Fei Yang
  Xinyi He
  Sunny Sun
+
+Broadcom Inc.
+ Gary Sweet

src/gpu_info_util/SystemInfo.cpp

@@ -27,24 +27,26 @@ std::string VendorName(VendorID vendor)
             return "AMD";
         case kVendorID_ARM:
             return "ARM";
+        case kVendorID_Broadcom:
+            return "Broadcom";
         case kVendorID_GOOGLE:
             return "Google";
-        case kVendorID_Intel:
-            return "Intel";
         case kVendorID_ImgTec:
             return "ImgTec";
+        case kVendorID_Intel:
+            return "Intel";
+        case kVendorID_Kazan:
+            return "Kazan";
         case kVendorID_NVIDIA:
             return "NVIDIA";
         case kVendorID_Qualcomm:
             return "Qualcomm";
-        case kVendorID_Vivante:
-            return "Vivante";
         case kVendorID_VeriSilicon:
             return "VeriSilicon";
+        case kVendorID_Vivante:
+            return "Vivante";
         case kVendorID_VMWare:
             return "VMWare";
-        case kVendorID_Kazan:
-            return "Kazan";
         default:
             return "Unknown (" + std::to_string(vendor) + ")";
     }
@@ -108,6 +110,11 @@ bool IsARM(VendorID vendorId)
     return vendorId == kVendorID_ARM;
 }
 
+bool IsBroadcom(VendorID vendorId)
+{
+    return vendorId == kVendorID_Broadcom;
+}
+
 bool IsImgTec(VendorID vendorId)
 {
     return vendorId == kVendorID_ImgTec;

src/gpu_info_util/SystemInfo.h

@@ -86,6 +86,7 @@ bool GetSystemInfo(SystemInfo *info);
 // Known PCI vendor IDs
 constexpr VendorID kVendorID_AMD      = 0x1002;
 constexpr VendorID kVendorID_ARM      = 0x13B5;
+constexpr VendorID kVendorID_Broadcom = 0x14E4;
 constexpr VendorID kVendorID_GOOGLE   = 0x1AE0;
 constexpr VendorID kVendorID_ImgTec   = 0x1010;
 constexpr VendorID kVendorID_Intel    = 0x8086;
@@ -104,6 +105,7 @@ constexpr DeviceID kDeviceID_Swiftshader = 0xC0DE;
 // Predicates on vendor IDs
 bool IsAMD(VendorID vendorId);
 bool IsARM(VendorID vendorId);
+bool IsBroadcom(VendorID vendorId);
 bool IsImgTec(VendorID vendorId);
 bool IsIntel(VendorID vendorId);
 bool IsKazan(VendorID vendorId);

src/gpu_info_util/SystemInfo_android.cpp

@@ -191,6 +191,11 @@ bool GetSystemInfo(SystemInfo *info)
                 gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
                 gpu.detailedDriverVersion.major = properties.driverVersion;
                 break;
+            case kVendorID_Broadcom:
+                gpu.driverVendor                = "Broadcom";
+                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
+                gpu.detailedDriverVersion.major = properties.driverVersion;
+                break;
             case kVendorID_ImgTec:
                 gpu.driverVendor                = "Imagination Technologies Limited";
                 gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
@@ -201,6 +206,11 @@ bool GetSystemInfo(SystemInfo *info)
                 gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
                 gpu.detailedDriverVersion.major = properties.driverVersion;
                 break;
+            case kVendorID_Kazan:
+                gpu.driverVendor                = "Kazan Software";
+                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
+                gpu.detailedDriverVersion.major = properties.driverVersion;
+                break;
             case kVendorID_NVIDIA:
                 gpu.driverVendor  = "NVIDIA Corporation";
                 gpu.driverVersion = FormatString("%d.%d.%d.%d", properties.driverVersion >> 22,
@@ -229,18 +239,13 @@ bool GetSystemInfo(SystemInfo *info)
                     gpu.detailedDriverVersion.major = properties.driverVersion;
                 }
                 break;
-            case kVendorID_Vivante:
-                gpu.driverVendor                = "Vivante";
-                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
-                gpu.detailedDriverVersion.major = properties.driverVersion;
-                break;
             case kVendorID_VeriSilicon:
                 gpu.driverVendor                = "VeriSilicon";
                 gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
                 gpu.detailedDriverVersion.major = properties.driverVersion;
                 break;
-            case kVendorID_Kazan:
-                gpu.driverVendor                = "Kazan Software";
+            case kVendorID_Vivante:
+                gpu.driverVendor                = "Vivante";
                 gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
                 gpu.detailedDriverVersion.major = properties.driverVersion;
                 break;

src/libANGLE/renderer/driver_utils.cpp

@@ -136,6 +136,8 @@ const char *GetVendorString(uint32_t vendorId)
             return "Advanced Micro Devices";
         case VENDOR_ID_ARM:
             return "ARM";
+        case VENDOR_ID_BROADCOM:
+            return "Broadcom";
         case VENDOR_ID_GOOGLE:
             return "Google";
         case VENDOR_ID_INTEL:

src/libANGLE/renderer/driver_utils.h

@@ -20,9 +20,11 @@ enum VendorID : uint32_t
     VENDOR_ID_UNKNOWN = 0x0,
     VENDOR_ID_AMD     = 0x1002,
     VENDOR_ID_ARM     = 0x13B5,
-    VENDOR_ID_GOOGLE  = 0x1AE0,
-    VENDOR_ID_INTEL   = 0x8086,
-    VENDOR_ID_NVIDIA  = 0x10DE,
+    // Broadcom devices won't use PCI, but this is their Vulkan vendor id.
+    VENDOR_ID_BROADCOM = 0x14E4,
+    VENDOR_ID_GOOGLE   = 0x1AE0,
+    VENDOR_ID_INTEL    = 0x8086,
+    VENDOR_ID_NVIDIA   = 0x10DE,
     // This is Qualcomm PCI Vendor ID.
     // Android doesn't have a PCI bus, but all we need is a unique id.
     VENDOR_ID_QUALCOMM = 0x5143,
@@ -46,6 +48,11 @@ inline bool IsARM(uint32_t vendorId)
     return vendorId == VENDOR_ID_ARM;
 }
 
+inline bool IsBroadcom(uint32_t vendorId)
+{
+    return vendorId == VENDOR_ID_BROADCOM;
+}
+
 inline bool IsIntel(uint32_t vendorId)
 {
     return vendorId == VENDOR_ID_INTEL;