Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1137716) for bustage

Browse Source 
CLOSED TREE

Backed out changeset 76b1809d22eb (bug 1137716)
Backed out changeset 726f8309756a (bug 1137716)
This commit is contained in:
Phil Ringnalda 2015-03-22 17:36:36 -07:00
parent ec3133be54
commit 103cef492e
4 changed files with 17 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
widget/GfxDriverInfo.cpp
View File

@ -28,8 +28,7 @@ GfxDriverInfo::GfxDriverInfo()
mComparisonOp(DRIVER_COMPARISON_IGNORED),
mDriverVersion(0),
mDriverVersionMax(0),
mSuggestedVersion(nullptr),
mGpu2(false)
mSuggestedVersion(nullptr)
{}
GfxDriverInfo::GfxDriverInfo(OperatingSystem os, nsAString& vendor,
@ -38,8 +37,7 @@ GfxDriverInfo::GfxDriverInfo(OperatingSystem os, nsAString& vendor,
VersionComparisonOp op,
uint64_t driverVersion,
const char *suggestedVersion /* = nullptr */,
bool ownDevices /* = false */,
bool gpu2 /* = false */)
bool ownDevices /* = false */)
: mOperatingSystem(os),
mOperatingSystemVersion(0),
mAdapterVendor(vendor),
@ -50,8 +48,7 @@ GfxDriverInfo::GfxDriverInfo(OperatingSystem os, nsAString& vendor,
mComparisonOp(op),
mDriverVersion(driverVersion),
mDriverVersionMax(0),
mSuggestedVersion(suggestedVersion),
mGpu2(gpu2)
mSuggestedVersion(suggestedVersion)
{}
GfxDriverInfo::GfxDriverInfo(const GfxDriverInfo& aOrig)
@ -217,35 +214,6 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id)
case Nvidia310M:
APPEND_DEVICE(0x0A70);
break;
case Bug1137716:
APPEND_DEVICE(0x0a29);
APPEND_DEVICE(0x0a2b);
APPEND_DEVICE(0x0a2d);
APPEND_DEVICE(0x0a35);
APPEND_DEVICE(0x0a6c);
APPEND_DEVICE(0x0a70);
APPEND_DEVICE(0x0a72);
APPEND_DEVICE(0x0a7a);
APPEND_DEVICE(0x0caf);
// GF180M ids
APPEND_DEVICE(0x0de3);
APPEND_DEVICE(0x0de8);
APPEND_DEVICE(0x0de9);
APPEND_DEVICE(0x0dea);
APPEND_DEVICE(0x0deb);
APPEND_DEVICE(0x0dec);
APPEND_DEVICE(0x0ded);
APPEND_DEVICE(0x0dee);
APPEND_DEVICE(0x0def);
APPEND_DEVICE(0x0df0);
APPEND_DEVICE(0x0df1);
APPEND_DEVICE(0x0df2);
APPEND_DEVICE(0x0df3);
APPEND_DEVICE(0x0df4);
APPEND_DEVICE(0x0df5);
APPEND_DEVICE(0x0df6);
APPEND_DEVICE(0x0df7);
break;
case AMDRadeonHD5800:
APPEND_DEVICE(0x6899);
break;

16
widget/GfxDriverInfo.h
View File

@ -25,17 +25,6 @@
mDriverInfo->AppendElement(info); \
} while (false)
#define APPEND_TO_DRIVER_BLOCKLIST_RANGE_GPU2(os, vendor, devices, feature, featureStatus, driverComparator, driverVersion, driverVersionMax, suggestedVersion) \
do { \
MOZ_ASSERT(driverComparator == DRIVER_BETWEEN_EXCLUSIVE || \
driverComparator == DRIVER_BETWEEN_INCLUSIVE || \
driverComparator == DRIVER_BETWEEN_INCLUSIVE_START); \
GfxDriverInfo info(os, vendor, devices, feature, featureStatus, driverComparator, driverVersion, suggestedVersion, false, true); \
info.mDriverVersionMax = driverVersionMax; \
mDriverInfo->AppendElement(info); \
} while (false)
namespace mozilla {
namespace widget {
@ -86,7 +75,6 @@ enum DeviceFamily {
Geforce7300GT,
Nvidia310M,
AMDRadeonHD5800,
Bug1137716,
DeviceFamilyMax
};
@ -110,7 +98,7 @@ struct GfxDriverInfo
GfxDriverInfo(OperatingSystem os, nsAString& vendor, GfxDeviceFamily* devices,
int32_t feature, int32_t featureStatus, VersionComparisonOp op,
uint64_t driverVersion, const char *suggestedVersion = nullptr,
bool ownDevices = false, bool gpu2 = false);
bool ownDevices = false);
GfxDriverInfo();
GfxDriverInfo(const GfxDriverInfo&);
@ -151,8 +139,6 @@ struct GfxDriverInfo
static nsAString* mDeviceVendors[DeviceVendorMax];
nsString mModel, mHardware, mProduct, mManufacturer;
bool mGpu2;
};
#define GFX_DRIVER_VERSION(a,b,c,d) \

37
widget/GfxInfoBase.cpp
View File

@ -606,34 +606,23 @@ GfxInfoBase::FindBlocklistedDeviceInList(const nsTArray<GfxDriverInfo>& info,
{
int32_t status = nsIGfxInfo::FEATURE_STATUS_UNKNOWN;
uint32_t i = 0;
for (; i < info.Length(); i++) {
// XXX: it would be better not to do this everytime round the loop
nsAutoString adapterVendorID;
nsAutoString adapterDeviceID;
nsAutoString adapterDriverVersionString;
if (info[i].mGpu2) {
if (NS_FAILED(GetAdapterVendorID2(adapterVendorID)) ||
NS_FAILED(GetAdapterDeviceID2(adapterDeviceID)) ||
NS_FAILED(GetAdapterDriverVersion2(adapterDriverVersionString)))
{
return 0;
}
} else {
if (NS_FAILED(GetAdapterVendorID(adapterVendorID)) ||
NS_FAILED(GetAdapterDeviceID(adapterDeviceID)) ||
NS_FAILED(GetAdapterDriverVersion(adapterDriverVersionString)))
{
return 0;
}
}
nsAutoString adapterVendorID;
nsAutoString adapterDeviceID;
nsAutoString adapterDriverVersionString;
if (NS_FAILED(GetAdapterVendorID(adapterVendorID)) ||
NS_FAILED(GetAdapterDeviceID(adapterDeviceID)) ||
NS_FAILED(GetAdapterDriverVersion(adapterDriverVersionString)))
{
return 0;
}
#if defined(XP_WIN) || defined(ANDROID)
uint64_t driverVersion;
ParseDriverVersion(adapterDriverVersionString, &driverVersion);
uint64_t driverVersion;
ParseDriverVersion(adapterDriverVersionString, &driverVersion);
#endif
uint32_t i = 0;
for (; i < info.Length(); i++) {
if (info[i].mOperatingSystem != DRIVER_OS_ALL &&
info[i].mOperatingSystem != os)
{

8
widget/windows/GfxInfo.cpp
View File

@ -1092,14 +1092,6 @@ GfxInfo::GetGfxDriverInfo()
(nsAString&)GfxDriverInfo::GetDeviceVendor(VendorATI), GfxDriverInfo::allDevices,
nsIGfxInfo::FEATURE_DXVA, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
DRIVER_EQUAL, V(15,200,1006,0));
/* Bug 1137716: XXX this should really check for the matching Intel piece as well.
* Unfortunately, we don't have the infrastructure to do that */
APPEND_TO_DRIVER_BLOCKLIST_RANGE_GPU2(DRIVER_OS_WINDOWS_7,
(nsAString&) GfxDriverInfo::GetDeviceVendor(VendorNVIDIA), (GfxDeviceFamily*)GfxDriverInfo::GetDeviceFamily(Bug1137716),
GfxDriverInfo::allFeatures, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
DRIVER_BETWEEN_INCLUSIVE, V(8,7,12,5730), V(8,17,12,6901), "Nvidia driver > 8.17.12.6901");
}
return *mDriverInfo;
}