[Libreoffice-commits] core.git: Branch 'feature/skia' - vcl/README.vars vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/README.vars |    7 +++++++
 vcl/skia/README |   11 +++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit bdc10284a90d3f7a98af70d789beeb980620658e
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Nov 4 14:37:05 2019 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Nov 4 14:37:55 2019 +0100

    move docs for Skia env.vars. to vcl/README.vars
    
    Change-Id: I9260e277b83f71ee06129802d8278f098796760c

diff --git a/vcl/README.vars b/vcl/README.vars
index 0530195363d8..65a088fa3f27 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -39,3 +39,10 @@ SAL_GL_SLEEP_ON_SWAP - sleep for half a second on each swap-buffers.
 SAL_WITHOUT_WIDGET_CACHE - disable LRU caching of native widget textures
 SAL_DISABLE_GLYPH_CACHING - don't render glyphs through OpenGL textures
 SAL_DISABLE_GL_WATCHDOG - don't start the thread that watches for broken GL drivers
+
+Skia
+----
+SAL_DISABLESKIA=1 - force disabled Skia
+SAL_ENABLESKIA=1 - enable Skia, unless blacklisted (and if the VCL backend supports Skia)
+SAL_FORCESKIA=1 - force using Skia, even if blacklisted
+SAL_SKIA=raster|vulkan - select Skia's drawing method, by default Vulkan is used
diff --git a/vcl/skia/README b/vcl/skia/README
index 6c3da7254b8b..793c16e8dd39 100644
--- a/vcl/skia/README
+++ b/vcl/skia/README
@@ -4,15 +4,10 @@ See external/skia for info on the library itself.
 Environment variables:
 ======================
 
-SAL_DISABLESKIA=1 - force disabled Skia
-SAL_ENABLESKIA=1 - enable Skia, unless blacklisted (and if the VCL backend supports Skia)
-SAL_FORCESKIA=1 - force using Skia, even if blacklisted
-SAL_SKIA=raster|vulkan - select Skia's drawing method, by default Vulkan is used
+See README.vars in the toplevel vcl/ directory. Note that many backends do not
+use Skia. E.g. on Linux it is necessary to also use SAL_USE_VCLPLUGIN=gen .
 
-There also also GUI options for controlling whether Skia is enabled.
-
-Note that many backends do not use Skia. E.g. on Linux it is necessary to also use
-SAL_USE_VCLPLUGIN=gen .
+There are also GUI options for controlling whether Skia is enabled.
 
 Skia drawing methods:
 =====================