[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/inc vcl/opengl

[Michael Meeks]

 vcl/inc/opengl/win/WinDeviceInfo.hxx |    1 -
 vcl/opengl/win/WinDeviceInfo.cxx     |   33 ---------------------------------
 2 files changed, 34 deletions(-)

New commits:
commit 22b852788d94ecacde533e3961a3535ef2a89f7d
Author: Michael Meeks <michael.meeks at 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 <ci at libreoffice.org>
    Reviewed-by: Bryan Quigley <gquigs at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/22217
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at 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 81e8d68..3f226c3 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.