Bug 1679998 - Part 1. Add Apple as a GPU vendor to GfxInfo. r=jrmuizel,mstange

Differential Revision: https://phabricator.services.mozilla.com/D98310
This commit is contained in:
Andrew Osmond 2020-12-01 16:26:43 +00:00
parent 4f05523121
commit da33064dce
2 changed files with 8 additions and 0 deletions

View File

@ -166,6 +166,7 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) {
case DeviceFamily::MicrosoftAll:
case DeviceFamily::ParallelsAll:
case DeviceFamily::QualcommAll:
case DeviceFamily::AppleAll:
return nullptr;
default:
break;
@ -791,6 +792,7 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) {
case DeviceFamily::MicrosoftAll:
case DeviceFamily::ParallelsAll:
case DeviceFamily::QualcommAll:
case DeviceFamily::AppleAll:
NS_WARNING("Invalid DeviceFamily id");
break;
}
@ -932,6 +934,9 @@ const nsAString& GfxDriverInfo::GetDeviceVendor(DeviceFamily id) {
case DeviceFamily::ParallelsAll:
vendor = DeviceVendor::Parallels;
break;
case DeviceFamily::AppleAll:
vendor = DeviceVendor::Apple;
break;
case DeviceFamily::QualcommAll:
// Choose an arbitrary Qualcomm PCI VENdor ID for now.
// TODO: This should be "QCOM" when Windows device ID parsing is reworked.
@ -969,6 +974,7 @@ const nsAString& GfxDriverInfo::GetDeviceVendor(DeviceVendor id) {
DECLARE_VENDOR_ID(Parallels, "0x1ab8");
DECLARE_VENDOR_ID(VMWare, "0x15ad");
DECLARE_VENDOR_ID(VirtualBox, "0x80ee");
DECLARE_VENDOR_ID(Apple, "0x106b");
// Choose an arbitrary Qualcomm PCI VENdor ID for now.
// TODO: This should be "QCOM" when Windows device ID parsing is reworked.
DECLARE_VENDOR_ID(Qualcomm, "0x5143");

View File

@ -171,6 +171,7 @@ enum class DeviceFamily : uint8_t {
MicrosoftAll,
ParallelsAll,
QualcommAll,
AppleAll,
IntelGMA500,
IntelGMA900,
IntelGMA950,
@ -216,6 +217,7 @@ enum class DeviceVendor : uint8_t {
Qualcomm,
MicrosoftBasic,
MicrosoftHyperV,
Apple,
Max
};