Commit 7b55aac3 by Gary Sweet Committed by Commit Bot

Add Broadcom as a known vendor

Broadcom's vendor ID wasn't listed anywhere. Fixed the sort order of vendor names in a number of places also. Bug: angleproject:4218 Change-Id: Iddc504fa35833ac14375cb77e7a2b1cc405f0e80 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1972714Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent 9dec123f
...@@ -32,6 +32,7 @@ IBM Inc. ...@@ -32,6 +32,7 @@ IBM Inc.
AdaptVis GmbH AdaptVis GmbH
Samsung Electronics, Inc. Samsung Electronics, Inc.
Arm Ltd. Arm Ltd.
Broadcom Inc.
Jacek Caban Jacek Caban
Mark Callow Mark Callow
......
...@@ -167,3 +167,6 @@ Arm Ltd. ...@@ -167,3 +167,6 @@ Arm Ltd.
Fei Yang Fei Yang
Xinyi He Xinyi He
Sunny Sun Sunny Sun
Broadcom Inc.
Gary Sweet
...@@ -27,24 +27,26 @@ std::string VendorName(VendorID vendor) ...@@ -27,24 +27,26 @@ std::string VendorName(VendorID vendor)
return "AMD"; return "AMD";
case kVendorID_ARM: case kVendorID_ARM:
return "ARM"; return "ARM";
case kVendorID_Broadcom:
return "Broadcom";
case kVendorID_GOOGLE: case kVendorID_GOOGLE:
return "Google"; return "Google";
case kVendorID_Intel:
return "Intel";
case kVendorID_ImgTec: case kVendorID_ImgTec:
return "ImgTec"; return "ImgTec";
case kVendorID_Intel:
return "Intel";
case kVendorID_Kazan:
return "Kazan";
case kVendorID_NVIDIA: case kVendorID_NVIDIA:
return "NVIDIA"; return "NVIDIA";
case kVendorID_Qualcomm: case kVendorID_Qualcomm:
return "Qualcomm"; return "Qualcomm";
case kVendorID_Vivante:
return "Vivante";
case kVendorID_VeriSilicon: case kVendorID_VeriSilicon:
return "VeriSilicon"; return "VeriSilicon";
case kVendorID_Vivante:
return "Vivante";
case kVendorID_VMWare: case kVendorID_VMWare:
return "VMWare"; return "VMWare";
case kVendorID_Kazan:
return "Kazan";
default: default:
return "Unknown (" + std::to_string(vendor) + ")"; return "Unknown (" + std::to_string(vendor) + ")";
} }
...@@ -108,6 +110,11 @@ bool IsARM(VendorID vendorId) ...@@ -108,6 +110,11 @@ bool IsARM(VendorID vendorId)
return vendorId == kVendorID_ARM; return vendorId == kVendorID_ARM;
} }
bool IsBroadcom(VendorID vendorId)
{
return vendorId == kVendorID_Broadcom;
}
bool IsImgTec(VendorID vendorId) bool IsImgTec(VendorID vendorId)
{ {
return vendorId == kVendorID_ImgTec; return vendorId == kVendorID_ImgTec;
......
...@@ -86,6 +86,7 @@ bool GetSystemInfo(SystemInfo *info); ...@@ -86,6 +86,7 @@ bool GetSystemInfo(SystemInfo *info);
// Known PCI vendor IDs // Known PCI vendor IDs
constexpr VendorID kVendorID_AMD = 0x1002; constexpr VendorID kVendorID_AMD = 0x1002;
constexpr VendorID kVendorID_ARM = 0x13B5; constexpr VendorID kVendorID_ARM = 0x13B5;
constexpr VendorID kVendorID_Broadcom = 0x14E4;
constexpr VendorID kVendorID_GOOGLE = 0x1AE0; constexpr VendorID kVendorID_GOOGLE = 0x1AE0;
constexpr VendorID kVendorID_ImgTec = 0x1010; constexpr VendorID kVendorID_ImgTec = 0x1010;
constexpr VendorID kVendorID_Intel = 0x8086; constexpr VendorID kVendorID_Intel = 0x8086;
...@@ -104,6 +105,7 @@ constexpr DeviceID kDeviceID_Swiftshader = 0xC0DE; ...@@ -104,6 +105,7 @@ constexpr DeviceID kDeviceID_Swiftshader = 0xC0DE;
// Predicates on vendor IDs // Predicates on vendor IDs
bool IsAMD(VendorID vendorId); bool IsAMD(VendorID vendorId);
bool IsARM(VendorID vendorId); bool IsARM(VendorID vendorId);
bool IsBroadcom(VendorID vendorId);
bool IsImgTec(VendorID vendorId); bool IsImgTec(VendorID vendorId);
bool IsIntel(VendorID vendorId); bool IsIntel(VendorID vendorId);
bool IsKazan(VendorID vendorId); bool IsKazan(VendorID vendorId);
......
...@@ -191,6 +191,11 @@ bool GetSystemInfo(SystemInfo *info) ...@@ -191,6 +191,11 @@ bool GetSystemInfo(SystemInfo *info)
gpu.driverVersion = FormatString("0x%x", properties.driverVersion); gpu.driverVersion = FormatString("0x%x", properties.driverVersion);
gpu.detailedDriverVersion.major = properties.driverVersion; gpu.detailedDriverVersion.major = properties.driverVersion;
break; break;
case kVendorID_Broadcom:
gpu.driverVendor = "Broadcom";
gpu.driverVersion = FormatString("0x%x", properties.driverVersion);
gpu.detailedDriverVersion.major = properties.driverVersion;
break;
case kVendorID_ImgTec: case kVendorID_ImgTec:
gpu.driverVendor = "Imagination Technologies Limited"; gpu.driverVendor = "Imagination Technologies Limited";
gpu.driverVersion = FormatString("0x%x", properties.driverVersion); gpu.driverVersion = FormatString("0x%x", properties.driverVersion);
...@@ -201,6 +206,11 @@ bool GetSystemInfo(SystemInfo *info) ...@@ -201,6 +206,11 @@ bool GetSystemInfo(SystemInfo *info)
gpu.driverVersion = FormatString("0x%x", properties.driverVersion); gpu.driverVersion = FormatString("0x%x", properties.driverVersion);
gpu.detailedDriverVersion.major = properties.driverVersion; gpu.detailedDriverVersion.major = properties.driverVersion;
break; break;
case kVendorID_Kazan:
gpu.driverVendor = "Kazan Software";
gpu.driverVersion = FormatString("0x%x", properties.driverVersion);
gpu.detailedDriverVersion.major = properties.driverVersion;
break;
case kVendorID_NVIDIA: case kVendorID_NVIDIA:
gpu.driverVendor = "NVIDIA Corporation"; gpu.driverVendor = "NVIDIA Corporation";
gpu.driverVersion = FormatString("%d.%d.%d.%d", properties.driverVersion >> 22, gpu.driverVersion = FormatString("%d.%d.%d.%d", properties.driverVersion >> 22,
...@@ -229,18 +239,13 @@ bool GetSystemInfo(SystemInfo *info) ...@@ -229,18 +239,13 @@ bool GetSystemInfo(SystemInfo *info)
gpu.detailedDriverVersion.major = properties.driverVersion; gpu.detailedDriverVersion.major = properties.driverVersion;
} }
break; break;
case kVendorID_Vivante:
gpu.driverVendor = "Vivante";
gpu.driverVersion = FormatString("0x%x", properties.driverVersion);
gpu.detailedDriverVersion.major = properties.driverVersion;
break;
case kVendorID_VeriSilicon: case kVendorID_VeriSilicon:
gpu.driverVendor = "VeriSilicon"; gpu.driverVendor = "VeriSilicon";
gpu.driverVersion = FormatString("0x%x", properties.driverVersion); gpu.driverVersion = FormatString("0x%x", properties.driverVersion);
gpu.detailedDriverVersion.major = properties.driverVersion; gpu.detailedDriverVersion.major = properties.driverVersion;
break; break;
case kVendorID_Kazan: case kVendorID_Vivante:
gpu.driverVendor = "Kazan Software"; gpu.driverVendor = "Vivante";
gpu.driverVersion = FormatString("0x%x", properties.driverVersion); gpu.driverVersion = FormatString("0x%x", properties.driverVersion);
gpu.detailedDriverVersion.major = properties.driverVersion; gpu.detailedDriverVersion.major = properties.driverVersion;
break; break;
......
...@@ -136,6 +136,8 @@ const char *GetVendorString(uint32_t vendorId) ...@@ -136,6 +136,8 @@ const char *GetVendorString(uint32_t vendorId)
return "Advanced Micro Devices"; return "Advanced Micro Devices";
case VENDOR_ID_ARM: case VENDOR_ID_ARM:
return "ARM"; return "ARM";
case VENDOR_ID_BROADCOM:
return "Broadcom";
case VENDOR_ID_GOOGLE: case VENDOR_ID_GOOGLE:
return "Google"; return "Google";
case VENDOR_ID_INTEL: case VENDOR_ID_INTEL:
......
...@@ -20,6 +20,8 @@ enum VendorID : uint32_t ...@@ -20,6 +20,8 @@ enum VendorID : uint32_t
VENDOR_ID_UNKNOWN = 0x0, VENDOR_ID_UNKNOWN = 0x0,
VENDOR_ID_AMD = 0x1002, VENDOR_ID_AMD = 0x1002,
VENDOR_ID_ARM = 0x13B5, VENDOR_ID_ARM = 0x13B5,
// Broadcom devices won't use PCI, but this is their Vulkan vendor id.
VENDOR_ID_BROADCOM = 0x14E4,
VENDOR_ID_GOOGLE = 0x1AE0, VENDOR_ID_GOOGLE = 0x1AE0,
VENDOR_ID_INTEL = 0x8086, VENDOR_ID_INTEL = 0x8086,
VENDOR_ID_NVIDIA = 0x10DE, VENDOR_ID_NVIDIA = 0x10DE,
...@@ -46,6 +48,11 @@ inline bool IsARM(uint32_t vendorId) ...@@ -46,6 +48,11 @@ inline bool IsARM(uint32_t vendorId)
return vendorId == VENDOR_ID_ARM; return vendorId == VENDOR_ID_ARM;
} }
inline bool IsBroadcom(uint32_t vendorId)
{
return vendorId == VENDOR_ID_BROADCOM;
}
inline bool IsIntel(uint32_t vendorId) inline bool IsIntel(uint32_t vendorId)
{ {
return vendorId == VENDOR_ID_INTEL; return vendorId == VENDOR_ID_INTEL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment