diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-02-08 17:11:28 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-02-09 07:50:13 +0000 |
| commit | 22b852788d94ecacde533e3961a3535ef2a89f7d (patch) | |
| tree | fcf1e1347429d38ea981b05e15a408df7492c773 /vcl | |
| parent | e8e01f16ece5f3c5dd1f75b5a1aee26a839ddb22 (diff) | |
tdf#97458 - remove unused intel opengl driver version special-casing.
Change-Id: I938bcab02edb37a5e7d72f1551867e0f5a4dd89b
Reviewed-on: https://gerrit.libreoffice.org/22215
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bryan Quigley <gquigs@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/22217
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/opengl/win/WinDeviceInfo.hxx | 1 | ||||
| -rw-r--r-- | vcl/opengl/win/WinDeviceInfo.cxx | 33 |
2 files changed, 0 insertions, 34 deletions
diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx b/vcl/inc/opengl/win/WinDeviceInfo.hxx index 9954983954bc..974d6b312f7d 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 81e8d685ae01..3f226c31cfa3 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -421,7 +421,6 @@ DriverInfo::~DriverInfo() WinOpenGLDeviceInfo::WinOpenGLDeviceInfo(): mbHasDualGPU(false), - mbHasDriverVersionMismatch(false), mbRDP(false) { GetData(); @@ -851,38 +850,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. |