diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-06 20:45:25 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-06 20:50:03 -0500 |
| commit | 20ed6886ade81ee015a22b2eb3aeff64691971bf (patch) | |
| tree | 96aa9162c897773a3f7e7be201875a3d80eea049 /sc/source/core/opencl | |
| parent | 5325137783825c498ed4236080ed7fe51cdec09a (diff) | |
Allow easy toggling of threaded OpenCL kernel compilation.
Via compiler defined macro.
Change-Id: Ic20e6564d99e8ae80c15eda5d12b4dbb76ffbd36
Diffstat (limited to 'sc/source/core/opencl')
| -rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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<DynamicKernel*>(createCompiledFormula(rDoc, rTopPos, xGroup, rCode)); + pKernel = static_cast<DynamicKernel*>(createCompiledFormula(rDoc, rTopPos, *xGroup, rCode)); } if (!pKernel) |