summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2016-07-12 19:39:33 +0100
committerTomaž Vajngerl <quikee@gmail.com>2016-07-12 23:45:18 +0000
commit9ad26139b5e8a4df469399378baeac5083f2fcf5 (patch)
treed593ed51c0339d6865d1dbb8c64af477f42ac211 /desktop
parentcca5cd7f725a045a19aba74f9ed2bbc3c1963cfc (diff)
tdf#100883 - opencl impls. that use SEH are still bad.
Amazingly we fell-back to the old calculation path for crashes in older LibreOffices. Change-Id: Ia182f7a25c5560b68494d5cdd68e02925bfd5845 Reviewed-on: https://gerrit.libreoffice.org/27169 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/opencl.cxx12
1 files changed, 12 insertions, 0 deletions
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 09f2204e07ca..2b8d6d67e98e 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -46,6 +46,8 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r
bool bSuccess = false;
css::uno::Reference< css::lang::XComponent > xComponent;
+ sal_uInt64 nKernelFailures = opencl::kernelFailures;
+
SAL_INFO("opencl", "Starting CL test spreadsheet");
try {
@@ -95,11 +97,21 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r
SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message);
}
+ if (nKernelFailures != opencl::kernelFailures)
+ {
+ // tdf#
+ SAL_WARN("opencl", "OpenCL kernels failed to compile, "
+ "or took SEH exceptions "
+ << nKernelFailures << " != " << opencl::kernelFailures);
+ bSuccess = false;
+ }
+
if (!bSuccess)
OpenCLZone::hardDisable();
if (xComponent.is())
xComponent->dispose();
+
return bSuccess;
}