summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/source/core/data/formulacell.cxx4
-rw-r--r--sc/source/core/opencl/formulagroupcl.cxx4
2 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 821bc67f3b11..a977ef717f33 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -54,7 +54,7 @@
#include <boost/scoped_ptr.hpp>
-#define ENABLE_THREADED_OPENCL_KERNEL_COMPILATION 1
+#define ENABLE_THREADED_OPENCL_KERNEL_COMPILATION 0
using namespace formula;
@@ -3506,8 +3506,6 @@ ScFormulaCellGroupRef ScFormulaCell::CreateCellGroup( SCROW nLen, bool bInvarian
#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION
if (mxGroup->sxCompilationThread.is())
mxGroup->scheduleCompilation();
-#else
- mxGroup->compileOpenCLKernel();
#endif
return mxGroup;
}
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 3cf52f5e422c..dab611026f46 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3208,6 +3208,10 @@ DynamicKernel::~DynamicKernel()
/// Build code
void DynamicKernel::CreateKernel(void)
{
+ if (mpKernel)
+ // already created.
+ return;
+
cl_int err;
std::string kname = "DynamicKernel"+mKernelSignature;
// Compile kernel here!!!