diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-17 12:56:31 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:09 +0100 |
| commit | 00dfb826d5e03d1c436b0573e4cc531d1021a8a7 (patch) | |
| tree | b22dfbe4f5999d4b9d76fe3a544d674733e461bf | |
| parent | a81cddb3b2bc2848111eb3781c26acdab7baf628 (diff) | |
fix Skia enabling (disabling and it should not be enabled by default)
Change-Id: I96bd8565a2a311d556ca96d868feccaf00a9cfe3
| -rw-r--r-- | vcl/skia/SkiaHelper.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index 787946ecfb20..278d19bd8d52 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -18,6 +18,14 @@ bool SkiaHelper::isVCLSkiaEnabled() { return false; } #else +static bool supportsVCLSkia() +{ + static bool bDisableSkia = !!getenv("SAL_DISABLESKIA"); + bool bBlacklisted = false; // TODO isDeviceBlacklisted(); + + return !bDisableSkia && !bBlacklisted; +} + bool SkiaHelper::isVCLSkiaEnabled() { /** @@ -50,7 +58,7 @@ bool SkiaHelper::isVCLSkiaEnabled() "SAL_FORCESKIA"); // TODO SKIA || officecfg::Office::Common::VCL::ForceOpenGL::get(); bool bRet = false; - bool bSupportsVCLSkia = true; // TODO SKIA supportsVCLOpenGL(); + bool bSupportsVCLSkia = supportsVCLSkia(); // TODO SKIA always call supportsVCLOpenGL to de-zombie the glxtest child process on X11 if (bForceSkia) { |