From 20ed6886ade81ee015a22b2eb3aeff64691971bf Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 6 Mar 2014 20:45:25 -0500 Subject: Allow easy toggling of threaded OpenCL kernel compilation. Via compiler defined macro. Change-Id: Ic20e6564d99e8ae80c15eda5d12b4dbb76ffbd36 --- sc/source/core/opencl/formulagroupcl.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sc/source/core/opencl') diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index ea1a7e024358..3cf52f5e422c 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -3342,7 +3342,7 @@ public: virtual ScMatrixRef inverseMatrix( const ScMatrix& rMat ) SAL_OVERRIDE; virtual CompiledFormula* createCompiledFormula(ScDocument& rDoc, const ScAddress& rTopPos, - ScFormulaCellGroupRef& xGroup, + ScFormulaCellGroup& rGroup, ScTokenArray& rCode) SAL_OVERRIDE; virtual bool interpret( ScDocument& rDoc, const ScAddress& rTopPos, ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode ) SAL_OVERRIDE; @@ -3427,15 +3427,15 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* rDoc */, CompiledFormula* FormulaGroupInterpreterOpenCL::createCompiledFormula(ScDocument& rDoc, const ScAddress& rTopPos, - ScFormulaCellGroupRef& xGroup, + ScFormulaCellGroup& rGroup, ScTokenArray& rCode) { ScTokenArray aConvertedCode; - ScGroupTokenConverter aConverter(aConvertedCode, rDoc, *xGroup->mpTopCell, rTopPos); + ScGroupTokenConverter aConverter(aConvertedCode, rDoc, *rGroup.mpTopCell, rTopPos); if (!aConverter.convert(rCode) || aConvertedCode.GetLen() == 0) return NULL; - SymbolTable::nR = xGroup->mnLength; + SymbolTable::nR = rGroup.mnLength; return DynamicKernel::create(rDoc, rTopPos, aConvertedCode); } @@ -3460,7 +3460,7 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc, else { assert(xGroup->meCalcState == sc::GroupCalcRunning); - pKernel = static_cast(createCompiledFormula(rDoc, rTopPos, xGroup, rCode)); + pKernel = static_cast(createCompiledFormula(rDoc, rTopPos, *xGroup, rCode)); } if (!pKernel) -- cgit v1.2.3