summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2016-07-08 22:16:27 +0900
committerMichael Meeks <michael.meeks@collabora.com>2016-07-12 08:56:47 +0000
commitb535d0ae52089bc7e28024b76a3380ab91574466 (patch)
tree14329c062e9c77f3d48a4d201ccc7cf581b9f26b /solenv
parent1bb21a08054d6909725ac46be8a4d6d7e5141d7c (diff)
opencl: OpenCLZone, detect CL device change and disable CL on crash
Guard OpenCL calls with OpenCLZone, so if a OpenCL call crashes we detect this and disable OpenCL so next time the user doesn't encounter the crash at the same calculation because he has a broken OpenCL drivers. Similar has been implemented for OpenGL with good results. Additionaly we persistently remember a known good OpenCL device ID and driver version so we can match this and perform calculation tests when they change. This is to ensure that the selected OpenCL device performs as we expect. In this commit the calculation tests aren't included yet. Remove complex static initializer in opencl wrapper library. Change-Id: I1a8b81ee31298731efcf63dc6a476955afc035e9 Reviewed-on: https://gerrit.libreoffice.org/27064 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit f41eb66302208f384a475fb20c98b6d1b0676cb6) Reviewed-on: https://gerrit.libreoffice.org/27099 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 8007f30a101b..8c00bd32ca7c 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -37,6 +37,7 @@ MERGE_LIBRARY_LIST := \
localebe1 \
mcnttype \
msfilter \
+ $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
package2 \
sax \
sb \