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

[Tor Lillqvist]

 vcl/README.vars                  |    2 +-
 vcl/win/source/gdi/winlayout.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c94294232f87fbaa588f67de792a32f49a1cb23
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 25 11:52:20 2015 +0300

    Turn on glyph caching by default when using OpenGL
    
    Can now be turned off with a SAL_DISABLE_GLYPH_CACHING environment variable.
    
    Change-Id: I7ac14d72dc0f85c0682d92492eb96bec1d207609
    (cherry picked from commit 9a68eb9c1f54d4c4e14a46c11ba9eafca35a2b82)
    Reviewed-on: https://gerrit.libreoffice.org/18230
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/README.vars b/vcl/README.vars
index 2749d869..5cd049f 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -20,4 +20,4 @@ OpenGL
 ------
 SAL_FORCEGL - force enable OpenGL
 SAL_WITHOUT_WIDGET_CACHE - disable LRU caching of native widget texutres
-SAL_ENABLE_GLYPH_CACHING - render glyphs to textures and use those, Windows only, WIP, broken
+SAL_DISABLE_GLYPH_CACHING - don't render glyphs through OpenGL textures
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index ae49357..24463a2 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1667,7 +1667,7 @@ void UniscribeLayout::DrawTextImpl(HDC hDC) const
 
 bool UniscribeLayout::CacheGlyphs(SalGraphics& rGraphics) const
 {
-    static bool bDoGlyphCaching = (std::getenv("SAL_ENABLE_GLYPH_CACHING") != NULL);
+    static bool bDoGlyphCaching = (std::getenv("SAL_DISABLE_GLYPH_CACHING") == NULL);
 
     if (!bDoGlyphCaching)
         return false;