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

[Tomaž Vajngerl]

 vcl/inc/opengl/win/WinDeviceInfo.hxx |    1 +
 vcl/opengl/win/WinDeviceInfo.cxx     |    4 +++-
 vcl/opengl/win/blocklist_parser.cxx  |    4 ++++
 vcl/source/opengl/OpenGLHelper.cxx   |    5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit a4bcb8c0be3b5b404fb84e2954f1b22a50e85a31
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Thu Nov 19 17:03:51 2015 +0100

    readability
    
    Change-Id: I8fbff3f86a543a58259408914bb78f992ad65864

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 79833d7..bfb043d 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -918,10 +918,13 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
 
     bool bRet = false;
     if (bForceOpenGL)
+    {
         bRet = true;
-
+    }
     else if (!supportsVCLOpenGL())
+    {
         bRet = false;
+    }
     else
     {
         static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL");
commit 3711ccb777a6a69d68ed221bd642c8dcd5557628
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Thu Nov 19 16:53:01 2015 +0100

    opengl: support Win 10 in black/white listing
    
    Change-Id: I9a3055fc60f738ab941816e40f4dd147deedafbe

diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index a400404..bbcd0b7 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -25,6 +25,7 @@ enum OperatingSystem {
     DRIVER_OS_WINDOWS_7,
     DRIVER_OS_WINDOWS_8,
     DRIVER_OS_WINDOWS_8_1,
+    DRIVER_OS_WINDOWS_10,
     DRIVER_OS_LINUX,
     DRIVER_OS_OS_X_10_5,
     DRIVER_OS_OS_X_10_6,
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index a6ef57e..5083f46 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -206,7 +206,7 @@ enum {
     kWindows7 = 0x60001,
     kWindows8 = 0x60002,
     kWindows8_1 = 0x60003,
-    kWindows10 = 0x60004
+    kWindows10 = 0x100000
 };
 
 
@@ -226,6 +226,8 @@ wgl::OperatingSystem WindowsVersionToOperatingSystem(int32_t aWindowsVersion)
             return wgl::DRIVER_OS_WINDOWS_8;
         case kWindows8_1:
             return wgl::DRIVER_OS_WINDOWS_8_1;
+        case kWindows10:
+            return wgl::DRIVER_OS_WINDOWS_10;
         case kWindowsUnknown:
         default:
             return wgl::DRIVER_OS_UNKNOWN;
diff --git a/vcl/opengl/win/blocklist_parser.cxx b/vcl/opengl/win/blocklist_parser.cxx
index b132265..dc113b7 100644
--- a/vcl/opengl/win/blocklist_parser.cxx
+++ b/vcl/opengl/win/blocklist_parser.cxx
@@ -55,6 +55,10 @@ wgl::OperatingSystem getOperatingSystem(const OString& rString)
     {
         return wgl::DRIVER_OS_WINDOWS_8_1;
     }
+    else if (rString == "10")
+    {
+        return wgl::DRIVER_OS_WINDOWS_10;
+    }
 
     return wgl::DRIVER_OS_UNKNOWN;
 }