diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-08-25 11:52:20 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-01 09:23:15 +0000 |
| commit | 4c94294232f87fbaa588f67de792a32f49a1cb23 (patch) | |
| tree | 7aac7c5c0c626339fbb067176309d8844e757fd8 | |
| parent | 508125f9e77c0ef2c5a49a1a4cd08d60ad63492c (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
(cherry picked from commit 9a68eb9c1f54d4c4e14a46c11ba9eafca35a2b82)
Reviewed-on: https://gerrit.libreoffice.org/18230
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -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 2749d869feef..5cd049fc5b39 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 ae493578c704..24463a2cb4b2 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; |