diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-08-25 11:52:20 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-08-25 11:55:40 +0300 |
commit | 9a68eb9c1f54d4c4e14a46c11ba9eafca35a2b82 (patch) | |
tree | 3deb516cae9fa3b0746c8c68c2eb42b6b7877533 /vcl | |
parent | af9751a760e9007d0450adf2753d8a65be5f536c (diff) |
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
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/README.vars | 2 | ||||
-rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/README.vars b/vcl/README.vars index b76b0517b07a..0cc857611701 100644 --- a/vcl/README.vars +++ b/vcl/README.vars @@ -21,4 +21,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 f26d3eb9b387..d341806b639d 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -1658,7 +1658,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; |