sc/inc/formulagroup.hxx | 2 +- sc/source/core/opencl/formulagroupcl.cxx | 4 ++-- sc/source/core/opencl/openclwrapper.cxx | 2 +- sc/source/core/opencl/openclwrapper.hxx | 2 +- sc/source/core/tool/formulagroup.cxx | 8 ++++---- sc/source/filter/ftools/clkernelthread.cxx | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 1a8f0db3e244c479739c466ce519d6c2ffb3e0c1 Author: Kohei Yoshida <[email protected]> Date: Tue Sep 17 20:57:48 2013 -0400 Be explicit on what kind of "kernels" we are compiling. Change-Id: I2415a192d98b94e86c08c138ad39cfdbf36ea283 diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx index c6f32ac..e7c13cd 100644 --- a/sc/inc/formulagroup.hxx +++ b/sc/inc/formulagroup.hxx @@ -56,7 +56,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter static FormulaGroupInterpreter *getStatic(); static void fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rPlatforms); static void switchOpenCLDevice(const OUString& rDeviceId, bool bAutoSelect); - static void compileKernels(); + static void compileOpenCLKernels(); virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) = 0; virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, const ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) = 0; diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index a311179..ab7076d 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -1095,9 +1095,9 @@ SAL_DLLPUBLIC_EXPORT bool SAL_CALL switchOpenClDevice(const OUString* pDeviceId, return sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect); } -SAL_DLLPUBLIC_EXPORT void compileKernels(const OUString* pDeviceId) +SAL_DLLPUBLIC_EXPORT void compileOpenCLKernels(const OUString* pDeviceId) { - sc::opencl::compileKernels(pDeviceId); + sc::opencl::compileOpenCLKernels(pDeviceId); } } diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 78d3bef..684abe6 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -2744,7 +2744,7 @@ bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect) return !OpenclDevice::initOpenclRunEnv(0); } -void compileKernels(const OUString* pDeviceId) +void compileOpenCLKernels(const OUString* pDeviceId) { if (!pDeviceId) return; diff --git a/sc/source/core/opencl/openclwrapper.hxx b/sc/source/core/opencl/openclwrapper.hxx index dfa8fbb..5a89e6b 100644 --- a/sc/source/core/opencl/openclwrapper.hxx +++ b/sc/source/core/opencl/openclwrapper.hxx @@ -266,7 +266,7 @@ const std::vector<OpenclPlatformInfo>& fillOpenCLInfo(); */ bool switchOpenclDevice(const OUString* pDeviceId, bool bAutoSelect); -void compileKernels(const OUString* pDeviceId); +void compileOpenCLKernels(const OUString* pDeviceId); }} diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index 6a20a0c..2f85ee5 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -338,7 +338,7 @@ typedef FormulaGroupInterpreter* (*__createFormulaGroupOpenCLInterpreter)(void); typedef size_t (*__getOpenCLPlatformCount)(void); typedef void (*__fillOpenCLInfo)(OpenclPlatformInfo*, size_t); typedef bool (*__switchOpenClDevice)(const OUString*, bool); -typedef void (*__compileKernels)(const OUString*); +typedef void (*__compileOpenCLKernels)(const OUString*); #endif @@ -458,7 +458,7 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool #endif } -void FormulaGroupInterpreter::compileKernels() +void FormulaGroupInterpreter::compileOpenCLKernels() { const ScCalcConfig& rConfig = ScInterpreter::GetGlobalConfig(); if (!rConfig.mbOpenCLEnabled) @@ -469,11 +469,11 @@ void FormulaGroupInterpreter::compileKernels() if (!pModule) return; - oslGenericFunction fn = pModule->getFunctionSymbol("compileKernels"); + oslGenericFunction fn = pModule->getFunctionSymbol("compileOpenCLKernels"); if (!fn) return; - reinterpret_cast<__compileKernels>(fn)(&rConfig.maOpenCLDevice); + reinterpret_cast<__compileOpenCLKernels>(fn)(&rConfig.maOpenCLDevice); } void FormulaGroupInterpreter::generateRPNCode(ScDocument& rDoc, const ScAddress& rPos, ScTokenArray& rCode) diff --git a/sc/source/filter/ftools/clkernelthread.cxx b/sc/source/filter/ftools/clkernelthread.cxx index f6d8c63..dcb1e74 100644 --- a/sc/source/filter/ftools/clkernelthread.cxx +++ b/sc/source/filter/ftools/clkernelthread.cxx @@ -20,7 +20,7 @@ CLBuildKernelThread::~CLBuildKernelThread() {} void CLBuildKernelThread::execute() { - sc::FormulaGroupInterpreter::compileKernels(); + sc::FormulaGroupInterpreter::compileOpenCLKernels(); } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
