diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-02-04 17:28:10 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-02-07 09:11:32 +0100 |
| commit | 397ad713cf9bc951b4882ca4b6baeb57541e318c (patch) | |
| tree | 2096facd2ea8432972d6354f960c528fa0f48a6a /desktop | |
| parent | bfb08ca517b6854b5c78b0b29c7a4d6dce473adb (diff) | |
merge OpenGLZone and OpenCLZone into one generic code
To be used also by Skia code to detect problems with Vulkan drivers.
The watchdog does not handle OpenCL because neither did the original
code, but also because OpenCLZone::hardDisable() called from it
would deadlock on SolarMutex for some reason.
Change-Id: I483d8cb0b11a4e1e65c564f4e4c29ab68843ff71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88008
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'desktop')
| -rwxr-xr-x | desktop/scripts/soffice.sh | 2 | ||||
| -rw-r--r-- | desktop/source/app/opencl.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 415ea047361d..5538c968ee18 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -130,7 +130,7 @@ for arg in "$@" $EXTRAOPT ; do unset MALLOC_CHECK_ MALLOC_PERTURB_ G_SLICE export SAL_DISABLE_FLOATGRAB=1 export OOO_DISABLE_RECOVERY=1 - export SAL_DISABLE_GL_WATCHDOG=1 + export SAL_DISABLE_WATCHDOG=1 export LD_BIND_NOW=1 ;; esac diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx index 4cbea032a15c..a1fe3c0f6aea 100644 --- a/desktop/source/app/opencl.cxx +++ b/desktop/source/app/opencl.cxx @@ -193,7 +193,7 @@ void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop) SAL_INFO("opencl", "Initiating test of OpenCL device"); OpenCLZone aZone; - OpenCLZone::enterInitialTest(); + OpenCLInitialZone aInitialZone; OUString aDevice = officecfg::Office::Calc::Formula::Calculation::OpenCLDevice::get(); OUString aSelectedCLDeviceVersionID; |