[Libreoffice-commits] core.git: Branch 'feature/fixes38' - 3 commits - vcl/opengl vcl/source vcl/win

[László Németh]

 vcl/opengl/win/gdiimpl.cxx         |    2 +-
 vcl/source/opengl/OpenGLHelper.cxx |    4 ++--
 vcl/win/gdi/winlayout.cxx          |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7c97c3265a66e5b97b2249fefdd6cb131b087859
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Thu Mar 2 17:12:00 2017 +0100

    Revert "disable GL"
    
    This reverts commit 31057b3ba8b7d73fb944b0c84e8f9689314d9421.

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 0ea127e..12f6151 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -798,7 +798,7 @@ bool OpenGLHelper::isDeviceBlacklisted()
 
 bool OpenGLHelper::supportsVCLOpenGL()
 {
-    static bool bDisableGL = true;
+    static bool bDisableGL = !!getenv("SAL_DISABLEGL");
     bool bBlacklisted = isDeviceBlacklisted();
 
     if (bDisableGL || bBlacklisted)
@@ -990,7 +990,7 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
      */
 
     bSet = true;
-    bForceOpenGL = false;
+    bForceOpenGL = !!getenv("SAL_FORCEGL") || officecfg::Office::Common::VCL::ForceOpenGL::get();
 
     bool bRet = false;
     if (bForceOpenGL)
commit 31057b3ba8b7d73fb944b0c84e8f9689314d9421
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Wed Mar 1 23:58:41 2017 +0100

    disable GL

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 12f6151..0ea127e 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -798,7 +798,7 @@ bool OpenGLHelper::isDeviceBlacklisted()
 
 bool OpenGLHelper::supportsVCLOpenGL()
 {
-    static bool bDisableGL = !!getenv("SAL_DISABLEGL");
+    static bool bDisableGL = true;
     bool bBlacklisted = isDeviceBlacklisted();
 
     if (bDisableGL || bBlacklisted)
@@ -990,7 +990,7 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
      */
 
     bSet = true;
-    bForceOpenGL = !!getenv("SAL_FORCEGL") || officecfg::Office::Common::VCL::ForceOpenGL::get();
+    bForceOpenGL = false;
 
     bool bRet = false;
     if (bForceOpenGL)
commit ed429014237ada0736cc6c74dbaaec2a62286835
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Thu Mar 2 17:07:40 2017 +0100

    Revert disable patches
    
    This is a combination of 3 commits.
    
    Revert "disable GL"
    
    This reverts commit c3cc9ec53e75ff41d81727e39e81272209e9fa0c.
    
    Revert "disable widget cache"
    
    This reverts commit 7e849e8d72dc02f27a0fb7f59f659daaaf751976.
    
    Revert "disable glyph catching"
    
    This reverts commit 95f5db5a7a3573f1ab40403e70e8dea17b66c45d.

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 3015353..310eb14 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -692,7 +692,7 @@ ControlCacheType gTextureCache(200);
 
 bool WinOpenGLSalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY)
 {
-    static bool gbCacheEnabled = false;
+    static bool gbCacheEnabled = !getenv("SAL_WITHOUT_WIDGET_CACHE");
 
     if (!gbCacheEnabled)
         return false;
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 0ea127e..12f6151 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -798,7 +798,7 @@ bool OpenGLHelper::isDeviceBlacklisted()
 
 bool OpenGLHelper::supportsVCLOpenGL()
 {
-    static bool bDisableGL = true;
+    static bool bDisableGL = !!getenv("SAL_DISABLEGL");
     bool bBlacklisted = isDeviceBlacklisted();
 
     if (bDisableGL || bBlacklisted)
@@ -990,7 +990,7 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
      */
 
     bSet = true;
-    bForceOpenGL = false;
+    bForceOpenGL = !!getenv("SAL_FORCEGL") || officecfg::Office::Common::VCL::ForceOpenGL::get();
 
     bool bRet = false;
     if (bForceOpenGL)
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 467441b..41b01c3 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -1458,7 +1458,7 @@ void WinLayout::DrawText(SalGraphics& rGraphics) const
 
 bool SimpleWinLayout::CacheGlyphs(SalGraphics& rGraphics) const
 {
-    static bool bDoGlyphCaching = false;
+    static bool bDoGlyphCaching = (std::getenv("SAL_DISABLE_GLYPH_CACHING") == NULL);
 
     if (!bDoGlyphCaching)
         return false;
@@ -2726,7 +2726,7 @@ bool UniscribeLayout::DrawTextImpl(HDC hDC,
 
 bool UniscribeLayout::CacheGlyphs(SalGraphics& rGraphics) const
 {
-    static bool bDoGlyphCaching = false;
+    static bool bDoGlyphCaching = (std::getenv("SAL_DISABLE_GLYPH_CACHING") == NULL);
 
     if (!bDoGlyphCaching)
         return false;