path: root/desktop/source/app/opencl.cxx
diff options
authorTor Lillqvist <>2016-08-12 16:53:48 +0300
committerTor Lillqvist <>2016-08-14 06:54:03 +0000
commit32881f01833dbcefd5600e1135dd8743178bfd96 (patch)
tree7adba5a0526fa23762c48cd21a8728737f67c6fc /desktop/source/app/opencl.cxx
parent7ffe3d742ee992cd704a52d9aeb9b131dded7d14 (diff)
tdf#100965: Restart on initialisation-time OpenCL crash
Add a flag to the OpenCLZone indicating whether we are performing the first-start OpenCL functionality verification, so that if we run into a crash that is caught by the VCL VCLExceptionSignal_impl() handler, we terminate the process with the EXITHELPER_NORMAL_RESTART status after first having disabled OpenCL use. The wrapper process will then restart soffice.bin. This is for Windows only so far. This matches what we do if OpenGL fails early during start of LibreOffice. Change-Id: Ibb9bf3a86b7521bf16728de2a118ad4323be674b Reviewed-on: Reviewed-by: Tor Lillqvist <> Tested-by: Tor Lillqvist <>
Diffstat (limited to 'desktop/source/app/opencl.cxx')
1 files changed, 1 insertions, 0 deletions
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 7eb83392f9f7..20bb981517fe 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -125,6 +125,7 @@ void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop)
SAL_INFO("opencl", "Initiating test of OpenCL device");
OpenCLZone aZone;
+ OpenCLZone::enterInitialTest();
OUString aDevice = officecfg::Office::Calc::Formula::Calculation::OpenCLDevice::get();
OUString aSelectedCLDeviceVersionID;