desktop/inc/app.hxx | 1 -
desktop/source/app/app.cxx | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 8a5f822897434cffe1991325ea18014734bfa24e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 28 12:32:29 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 28 18:02:22 2024 +0200
tdf#161048 Revert "move opencl check at startup inside its own thread"
This reverts commit 7d1242b01d3ad9be1cfcf2bd3fbee9ce63dddddf.
Intel's OpenCL driver gets stuck during shutdown and blocks the process
from exiting
Change-Id: I0e1360fd183dacd7331e1dd4122154d705f567fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168067
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 7a789b59b55a..0c96240f1b0d 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -169,7 +169,6 @@ class Desktop final : public Application
std::unique_ptr<Lockfile> m_xLockfile;
Timer m_firstRunTimer;
std::thread m_aUpdateThread;
- std::thread m_aOpenCLCheckThread;
};
OUString GetURL_Impl(
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 7075d6afcb89..b00dd75a39e6 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1613,7 +1613,7 @@ int Desktop::Main()
// FIXME: move this somewhere sensible.
#if HAVE_FEATURE_OPENCL
- m_aOpenCLCheckThread = std::thread(CheckOpenCLCompute, xDesktop);
+ CheckOpenCLCompute(xDesktop);
#endif
#if !defined(EMSCRIPTEN)
@@ -1670,9 +1670,6 @@ int Desktop::doShutdown()
if (m_aUpdateThread.joinable())
m_aUpdateThread.join();
- if (m_aOpenCLCheckThread.joinable())
- m_aOpenCLCheckThread.join();
-
if (pExecGlobals->xJVMloadThread.is())
{
pExecGlobals->xJVMloadThread->join();
