From e2d5eec6ad49bab6aac2295a1882bf75184aa50c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 12 Aug 2016 15:56:52 +0300 Subject: tdf#100965: Restart on initialisation-time OpenCL crash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Also, the enter() and leave() functions are not used anywhere (cherry picked from commit 32881f01833dbcefd5600e1135dd8743178bfd96) (cherry picked from commit b9898f03eb05411c508b1b02588812074d40417a) Change-Id: Ibb9bf3a86b7521bf16728de2a118ad4323be674b Reviewed-on: https://gerrit.libreoffice.org/28138 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- desktop/source/app/opencl.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'desktop') diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx index 2b8d6d67e98e..13161f3a299f 100644 --- a/desktop/source/app/opencl.cxx +++ b/desktop/source/app/opencl.cxx @@ -123,6 +123,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; -- cgit