opencl/source/openclwrapper.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit b4f341389ce7fa889e8a668be0233d1dbbd814c2 Author: Kohei Yoshida <[email protected]> Date: Tue Apr 25 22:24:04 2017 -0400 Revert the wrong "cleanup" change. Introduced by 63df0796f5ec500f3b6fb34510d4bc79c009e76d. Change-Id: I2481bcef144bd30571e69130d22f6d313dbddfea Reviewed-on: https://gerrit.libreoffice.org/36968 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index 8660dd744816..892c2dd1bcf0 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -791,7 +791,10 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, size_t& rDeviceId, size_ bool canUseOpenCL() { - return !getenv("SAL_DISABLE_OPENCL") || !officecfg::Office::Common::Misc::UseOpenCL::get(); + if (getenv("SAL_DISABLE_OPENCL") || !officecfg::Office::Common::Misc::UseOpenCL::get()) + return false; + + return true; } bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation, OUString& rOutSelectedDeviceVersionIDString) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
