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 /opencl | |
| 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 'opencl')
| -rw-r--r-- | opencl/source/OpenCLZone.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/opencl/source/OpenCLZone.cxx b/opencl/source/OpenCLZone.cxx index f7c8e961364d..43ac31899c4d 100644 --- a/opencl/source/OpenCLZone.cxx +++ b/opencl/source/OpenCLZone.cxx @@ -17,11 +17,6 @@ #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> -// FIXME: templatize me vs. OpenGLZone. - -std::sig_atomic_t volatile OpenCLZone::gnEnterCount = 0; -bool volatile OpenCLZone::gbInInitialTest = false; - /** * Called from a signal handler if we get * a crash or hang in some CL code. @@ -47,9 +42,4 @@ void OpenCLZone::hardDisable() } } -void OpenCLZone::enterInitialTest() -{ - gbInInitialTest = true; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |