Commit 3c219171 by Michael Spang Committed by Commit Bot

Add ARM vendor id

This fixes a crash when run with asserts on ARM GPU: [2089630:1566159375:0531/202059.262200:ERROR:angle_platform_impl.cc(47)] GetVendorString(133): ! Assert failed in GetVendorString (../../third_party/angle/src/libANGLE/renderer/driver_utils.cpp:133): vendorId == 0xba5eba11 Bug: angleproject:3492 Change-Id: I786edc459b1567a3eee0034a0d8ae7050ac31952 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1642331 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 44063c80
...@@ -127,6 +127,8 @@ const char *GetVendorString(uint32_t vendorId) ...@@ -127,6 +127,8 @@ const char *GetVendorString(uint32_t vendorId)
return "Intel"; return "Intel";
case VENDOR_ID_QUALCOMM: case VENDOR_ID_QUALCOMM:
return "Qualcomm"; return "Qualcomm";
case VENDOR_ID_ARM:
return "ARM";
default: default:
// TODO(jmadill): More vendor IDs. // TODO(jmadill): More vendor IDs.
ASSERT(vendorId == 0xba5eba11); // Mock vendor ID used for tests. ASSERT(vendorId == 0xba5eba11); // Mock vendor ID used for tests.
......
...@@ -19,6 +19,7 @@ enum VendorID : uint32_t ...@@ -19,6 +19,7 @@ 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_INTEL = 0x8086, VENDOR_ID_INTEL = 0x8086,
VENDOR_ID_NVIDIA = 0x10DE, VENDOR_ID_NVIDIA = 0x10DE,
// This is Qualcomm PCI Vendor ID. // This is Qualcomm PCI Vendor ID.
...@@ -39,6 +40,11 @@ inline bool IsAMD(uint32_t vendorId) ...@@ -39,6 +40,11 @@ inline bool IsAMD(uint32_t vendorId)
return vendorId == VENDOR_ID_AMD; return vendorId == VENDOR_ID_AMD;
} }
inline bool IsARM(uint32_t vendorId)
{
return vendorId == VENDOR_ID_ARM;
}
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