vcl/inc/opengl/win/WinDeviceInfo.hxx | 1 -
vcl/opengl/win/WinDeviceInfo.cxx | 33 ---------------------------------
2 files changed, 34 deletions(-)
New commits:
commit ce81a477d228277f44e96356e85d92467eb7a0b9
Author: Michael Meeks <michael.me...@collabora.com>
Date: Mon Feb 8 17:11:28 2016 +0000
tdf#97458 - remove unused intel opengl driver version special-casing.
Change-Id: I938bcab02edb37a5e7d72f1551867e0f5a4dd89b
Reviewed-on: https://gerrit.libreoffice.org/22215
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Bryan Quigley <gqu...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx
b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 9954983..974d6b3 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -143,7 +143,6 @@ private:
uint32_t mnWindowsVersion;
bool mbHasDualGPU;
- bool mbHasDriverVersionMismatch;
bool mbRDP;
void GetData();
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 11a11d3..798dc58 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -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.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
