Kaydet (Commit) ce81a477 authored tarafından Michael Meeks's avatar Michael Meeks

tdf#97458 - remove unused intel opengl driver version special-casing.

Change-Id: I938bcab02edb37a5e7d72f1551867e0f5a4dd89b
Reviewed-on: https://gerrit.libreoffice.org/22215Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarBryan Quigley <gquigs@gmail.com>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst dea2e507
......@@ -143,7 +143,6 @@ private:
uint32_t mnWindowsVersion;
bool mbHasDualGPU;
bool mbHasDriverVersionMismatch;
bool mbRDP;
void GetData();
......
......@@ -411,7 +411,6 @@ DriverInfo::~DriverInfo()
WinOpenGLDeviceInfo::WinOpenGLDeviceInfo():
mbHasDualGPU(false),
mbHasDriverVersionMismatch(false),
mbRDP(false)
{
GetData();
......@@ -841,38 +840,6 @@ void WinOpenGLDeviceInfo::GetData()
SetupDiDestroyDeviceInfoList(devinfo);
}
}
mbHasDriverVersionMismatch = false;
if (maAdapterVendorID == GetDeviceVendor(wgl::VendorIntel))
{
// we've had big crashes (moz#590373 and moz#595364) apparently correlated
// with bad Intel driver installations where the DriverVersion reported
// by the registry was not the version of the DLL.
OUString aDLLFileName("igd10umd32.dll");
OUString aDLLFileName2("igd10iumd32.dll");
OUString aDLLVersion, aDLLVersion2;
GetDLLVersion(aDLLFileName.getStr(), aDLLVersion);
GetDLLVersion(aDLLFileName2.getStr(), aDLLVersion2);
uint64_t dllNumericVersion = 0, dllNumericVersion2 = 0,
driverNumericVersion = 0, knownSafeMismatchVersion = 0;
wgl::ParseDriverVersion(aDLLVersion, dllNumericVersion);
wgl::ParseDriverVersion(aDLLVersion2, dllNumericVersion2);
wgl::ParseDriverVersion(maDriverVersion, driverNumericVersion);
wgl::ParseDriverVersion("9.17.10.0", knownSafeMismatchVersion);
// If there's a driver version mismatch, consider this harmful only when
// the driver version is less than knownSafeMismatchVersion. See the
// above comment about crashes with old mismatches. If the GetDllVersion
// call fails, then they return 0, so that will be considered a mismatch.
if (dllNumericVersion != driverNumericVersion &&
dllNumericVersion2 != driverNumericVersion &&
(driverNumericVersion < knownSafeMismatchVersion ||
std::max(dllNumericVersion, dllNumericVersion2) < knownSafeMismatchVersion))
{
mbHasDriverVersionMismatch = true;
}
}
}
// Macro for assigning a device vendor id to a string.
......
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