[Libreoffice-commits] core.git: vcl/source

[Jan Holesovsky]

 vcl/source/opengl/OpenGLHelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81b9c4e20a1749d143715eb4367be104da7c872f
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Sep 20 09:47:36 2016 +0200

    tdf#102295: AMD actually has two vendor id's.
    
    Change-Id: I9cc1341c8f8d154927a778dfa15b8d3013a9a487

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index dc19e4c..cf508b3 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -782,7 +782,7 @@ bool OpenGLHelper::isDeviceBlacklisted()
         bBlacklisted = aInfo.isDeviceBlocked();
 
         if (aInfo.GetWindowsVersion() == 0x00060001 && /* Windows 7 */
-            aInfo.GetAdapterVendorID() == "0x1022")    /* AMD */
+            (aInfo.GetAdapterVendorID() == "0x1002" || aInfo.GetAdapterVendorID() == "0x1022")) /* AMD */
         {
             SAL_INFO("vcl.opengl", "Relaxing watchdog timings.");
             OpenGLZone::relaxWatchdogTimings();