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

[Tor Lillqvist]

 vcl/opengl/opengl_blacklist_windows.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ce849354352e353561c9ba9c5b8d76d47d9d120
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 6 18:51:30 2016 +0200

    We should compare an Intel version to 15.40.4.64, not 15.40.4.64.4256
    
    That's what the code originally did, when the versions were hardcoded
    in the C++ code. The 15.40.4.64.4256 is the "marketing" number for the
    version that was suggested to use instead. The code can not handle
    five-number versions anyway, and this blacklist entry was ignored. An
    actual version as reported by the system always has four numbers, to
    the best of my knowledge.
    
    Change-Id: If7e2e91bbd81fc75d03eacb38580df16c6e09d78
    (cherry picked from commit 90e1baf4ed1cf03bec430870d870ede0984f9adc)

diff --git a/vcl/opengl/opengl_blacklist_windows.xml b/vcl/opengl/opengl_blacklist_windows.xml
index cc8d6c4..7951a8c 100644
--- a/vcl/opengl/opengl_blacklist_windows.xml
+++ b/vcl/opengl/opengl_blacklist_windows.xml
@@ -21,7 +21,7 @@
     <whitelist>
     </whitelist>
     <blacklist>
-        <entry os="all" vendor="intel" compare="less" version="15.40.4.64.4256"> <!-- 15.40.4.64.4256 -->
+        <entry os="all" vendor="intel" compare="less" version="15.40.4.64"> <!-- 15.40.4.64.4256 -->
             <device id="all"/>
         </entry>
         <entry os="all" vendor="ati" compare="less" version="15.200.1062.1004"> <!-- 150.200 -->