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

[Michael Meeks]

 vcl/opengl/win/WinDeviceInfo.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 320c6e5dd2cfae2c42e9d75b0890bec6143b4adc
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Oct 7 10:53:28 2015 +0100

    tdf#94686: Disable all vendors except for AMD/ATI/Intel/NVIDIA for now
    
    Change-Id: I769aa1e0645b36f8623187e2e485ad2c474914c1
    Reviewed-on: https://gerrit.libreoffice.org/19222
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index e3dec31..768930e 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -727,6 +727,14 @@ bool WinOpenGLDeviceInfo::isDeviceBlocked()
         return true;
     }
 
+    /* Anything that's exotic eg. VMWare / VirtualBox GL drivers
+       we're not interested in for now. */
+    if (maAdapterVendorID != GetDeviceVendor(wgl::VendorAMD) &&
+        maAdapterVendorID != GetDeviceVendor(wgl::VendorATI) &&
+        maAdapterVendorID != GetDeviceVendor(wgl::VendorIntel) &&
+        maAdapterVendorID != GetDeviceVendor(wgl::VendorNVIDIA))
+        return true;
+
     return FindBlocklistedDeviceInList();
 }