[Libreoffice-commits] core.git: 2 commits - vcl/opengl

[Tor Lillqvist]

 vcl/opengl/win/WinDeviceInfo.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 3a8aff659bbd32543f28f796f59b6225f1011876
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 16 17:14:42 2015 +0300

    Drop duplicated statements
    
    In the original Mozilla code the statements differed, as there were
    separate ones for FEATURE_OPENGL_LAYERS and FEATURE_WEBGL_OPENGL.
    These two uses have been combined here.
    
    Change-Id: Idc2533f23d48761249a905b298b1ebbfde0e3a54

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 33360c4..9103324 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -1121,12 +1121,6 @@ void WinOpenGLDeviceInfo::FillBlacklist()
             GetDeviceVendor(wgl::VendorATI), wgl::DriverInfo::allDevices,
             wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
     APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
-            GetDeviceVendor(wgl::VendorATI), wgl::DriverInfo::allDevices,
-            wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
-    APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
-            GetDeviceVendor(wgl::VendorAMD), wgl::DriverInfo::allDevices,
-            wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
-    APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
             GetDeviceVendor(wgl::VendorAMD), wgl::DriverInfo::allDevices,
             wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
 
@@ -1175,9 +1169,6 @@ void WinOpenGLDeviceInfo::FillBlacklist()
     APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
             GetDeviceVendor(wgl::VendorIntel), wgl::DriverInfo::allDevices,
             wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
-    APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
-            GetDeviceVendor(wgl::VendorIntel), wgl::DriverInfo::allDevices,
-            wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
 
     /**
      * Disable acceleration on Intel HD 3000 for graphics drivers <= 8.15.10.2321.
commit b2cd406dce247786f4b7a5a2ccec0bd4c6fdf3cc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 16 17:10:48 2015 +0300

    Log blacklisting more visibly
    
    Change-Id: I7c661181ed7904650eff103d097ab357d3b8dfea

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index abc367a..33360c4 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -722,6 +722,7 @@ bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList()
         }
     }
 
+    SAL_INFO("vcl.opengl", (match ? "BLACKLISTED" : "not blacklisted"));
     return match;
 }