From 27ebfb10e9fba1af3bfee86973a349168bd041b1 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 3 Oct 2014 15:16:06 -0400 Subject: Let's consistently spell OpenCL as 'OpenCL'. Change-Id: I8bdcf0667b326b77d11001efeeefd5247987ebdc --- sc/source/core/opencl/formulagroupcl.cxx | 48 ++++++++++----------- sc/source/core/opencl/openclwrapper.cxx | 74 ++++++++++++++++---------------- sc/source/core/opencl/openclwrapper.hxx | 16 +++---- sc/source/core/tool/formulagroup.cxx | 20 ++++----- sc/source/core/tool/platforminfo.cxx | 4 +- sc/source/ui/optdlg/calcoptionsdlg.cxx | 18 ++++---- sc/source/ui/optdlg/calcoptionsdlg.hxx | 6 +-- sc/source/ui/unoobj/docuno.cxx | 6 +-- 8 files changed, 96 insertions(+), 96 deletions(-) (limited to 'sc/source') diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 1b3dc093468e..2818af1bcc39 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -95,7 +95,7 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int, cl_program ) } // Obtain cl context KernelEnv kEnv; - OpenclDevice::setKernelEnv(&kEnv); + OpenCLDevice::setKernelEnv(&kEnv); cl_int err; if (pHostBuffer) { @@ -186,7 +186,7 @@ public: // marshaling // Obtain cl context KernelEnv kEnv; - OpenclDevice::setKernelEnv(&kEnv); + OpenCLDevice::setKernelEnv(&kEnv); // Pass the scalar result back to the rest of the formula kernel cl_int err = clSetKernelArg(k, argno, sizeof(cl_uint), (void*)&hashCode); if (CL_SUCCESS != err) @@ -370,7 +370,7 @@ size_t DynamicKernelStringArgument::Marshal( cl_kernel k, int argno, int, cl_pro FormulaToken* ref = mFormulaTree->GetFormulaToken(); // Obtain cl context KernelEnv kEnv; - OpenclDevice::setKernelEnv(&kEnv); + OpenCLDevice::setKernelEnv(&kEnv); cl_int err; formula::VectorRefArray vRef; size_t nStrings = 0; @@ -1113,7 +1113,7 @@ public: assert(Base::mpClmem == NULL); // Obtain cl context KernelEnv kEnv; - OpenclDevice::setKernelEnv(&kEnv); + OpenCLDevice::setKernelEnv(&kEnv); cl_int err; size_t nInput = mpDVR->GetArrayLength(); size_t nCurWindowSize = mpDVR->GetRefRowSize(); @@ -1894,7 +1894,7 @@ public: { // Obtain cl context KernelEnv kEnv; - OpenclDevice::setKernelEnv(&kEnv); + OpenCLDevice::setKernelEnv(&kEnv); cl_int err; cl_mem pClmem2; @@ -1952,7 +1952,7 @@ public: { // Obtain cl context KernelEnv kEnv; - OpenclDevice::setKernelEnv(&kEnv); + OpenCLDevice::setKernelEnv(&kEnv); cl_int err; DynamicKernelArgument* Arg = mvSubArguments[0].get(); DynamicKernelSlidingArgument* slidingArgPtr = @@ -3260,11 +3260,11 @@ public: DynamicKernelSoPArguments>(mpRoot, new OpNop); std::stringstream decl; - if (OpenclDevice::gpuEnv.mnKhrFp64Flag) + if (OpenCLDevice::gpuEnv.mnKhrFp64Flag) { decl << "#pragma OPENCL EXTENSION cl_khr_fp64: enable\n"; } - else if (OpenclDevice::gpuEnv.mnAmdFp64Flag) + else if (OpenCLDevice::gpuEnv.mnAmdFp64Flag) { decl << "#pragma OPENCL EXTENSION cl_amd_fp64: enable\n"; } @@ -3326,7 +3326,7 @@ public: { // Obtain cl context KernelEnv kEnv; - OpenclDevice::setKernelEnv(&kEnv); + OpenCLDevice::setKernelEnv(&kEnv); cl_int err; // The results mpResClmem = clCreateBuffer(kEnv.mpkContext, @@ -3388,7 +3388,7 @@ void DynamicKernel::CreateKernel() // Compile kernel here!!! // Obtain cl context KernelEnv kEnv; - OpenclDevice::setKernelEnv(&kEnv); + OpenCLDevice::setKernelEnv(&kEnv); const char* src = mFullProgramSrc.c_str(); static std::string lastOneKernelHash = ""; static std::string lastSecondKernelHash = ""; @@ -3410,11 +3410,11 @@ void DynamicKernel::CreateKernel() { clReleaseProgram(lastSecondProgram); } - if (OpenclDevice::buildProgramFromBinary("", - &OpenclDevice::gpuEnv, KernelHash.c_str(), 0)) + if (OpenCLDevice::buildProgramFromBinary("", + &OpenCLDevice::gpuEnv, KernelHash.c_str(), 0)) { - mpProgram = OpenclDevice::gpuEnv.mpArryPrograms[0]; - OpenclDevice::gpuEnv.mpArryPrograms[0] = NULL; + mpProgram = OpenCLDevice::gpuEnv.mpArryPrograms[0]; + OpenCLDevice::gpuEnv.mpArryPrograms[0] = NULL; } else { @@ -3423,7 +3423,7 @@ void DynamicKernel::CreateKernel() if (err != CL_SUCCESS) throw OpenCLError(err, __FILE__, __LINE__); err = clBuildProgram(mpProgram, 1, - OpenclDevice::gpuEnv.mpArryDevsID, "", NULL, NULL); + OpenCLDevice::gpuEnv.mpArryDevsID, "", NULL, NULL); if (err != CL_SUCCESS) { #if OSL_DEBUG_LEVEL > 0 @@ -3431,7 +3431,7 @@ void DynamicKernel::CreateKernel() { cl_build_status stat; cl_int e = clGetProgramBuildInfo( - mpProgram, OpenclDevice::gpuEnv.mpArryDevsID[0], + mpProgram, OpenCLDevice::gpuEnv.mpArryDevsID[0], CL_PROGRAM_BUILD_STATUS, sizeof(cl_build_status), &stat, 0); SAL_WARN_IF( @@ -3443,7 +3443,7 @@ void DynamicKernel::CreateKernel() { size_t n; e = clGetProgramBuildInfo( - mpProgram, OpenclDevice::gpuEnv.mpArryDevsID[0], + mpProgram, OpenCLDevice::gpuEnv.mpArryDevsID[0], CL_PROGRAM_BUILD_LOG, 0, 0, &n); SAL_WARN_IF( e != CL_SUCCESS || n == 0, "sc.opencl", @@ -3454,7 +3454,7 @@ void DynamicKernel::CreateKernel() { std::vector log(n); e = clGetProgramBuildInfo( - mpProgram, OpenclDevice::gpuEnv.mpArryDevsID[0], + mpProgram, OpenCLDevice::gpuEnv.mpArryDevsID[0], CL_PROGRAM_BUILD_LOG, n, &log[0], 0); SAL_WARN_IF( e != CL_SUCCESS || n == 0, "sc.opencl", @@ -3473,7 +3473,7 @@ void DynamicKernel::CreateKernel() throw OpenCLError(err, __FILE__, __LINE__); } // Generate binary out of compiled kernel. - OpenclDevice::generatBinFromKernelSource(mpProgram, + OpenCLDevice::generatBinFromKernelSource(mpProgram, (mKernelSignature + GetMD5()).c_str()); } lastSecondKernelHash = lastOneKernelHash; @@ -3661,7 +3661,7 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc, { // Obtain cl context KernelEnv kEnv; - OpenclDevice::setKernelEnv(&kEnv); + OpenCLDevice::setKernelEnv(&kEnv); // Run the kernel. pKernel->Launch(xGroup->mnLength); // Map results back @@ -3744,20 +3744,20 @@ SAL_DLLPUBLIC_EXPORT size_t getOpenCLPlatformCount() } SAL_DLLPUBLIC_EXPORT void SAL_CALL fillOpenCLInfo( - sc::OpenclPlatformInfo* pInfos, size_t nInfoSize ) + sc::OpenCLPlatformInfo* pInfos, size_t nInfoSize ) { - const std::vector& rPlatforms = + const std::vector& rPlatforms = sc::opencl::fillOpenCLInfo(); size_t n = std::min(rPlatforms.size(), nInfoSize); for (size_t i = 0; i < n; ++i) pInfos[i] = rPlatforms[i]; } -SAL_DLLPUBLIC_EXPORT bool SAL_CALL switchOpenClDevice( +SAL_DLLPUBLIC_EXPORT bool SAL_CALL switchOpenCLDevice( const OUString* pDeviceId, bool bAutoSelect, bool bForceEvaluation ) { - return sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect, bForceEvaluation); + return sc::opencl::switchOpenCLDevice(pDeviceId, bAutoSelect, bForceEvaluation); } SAL_DLLPUBLIC_EXPORT void SAL_CALL getOpenCLDeviceInfo( size_t* pDeviceId, size_t* pPlatformId ) diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 79e79255289b..629ccaa463b2 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -43,8 +43,8 @@ using namespace std; namespace sc { namespace opencl { -GPUEnv OpenclDevice::gpuEnv; -bool OpenclDevice::bIsInited = false; +GPUEnv OpenCLDevice::gpuEnv; +bool OpenCLDevice::bIsInited = false; namespace { @@ -87,7 +87,7 @@ void clearCache() // more. So there is little this function can do until we come up // with some other way to figure out which cached .bin files are // "current". - OUString aCacheDirURL(rtl::OStringToOUString(OpenclDevice::maCacheFolder, RTL_TEXTENCODING_UTF8)); + OUString aCacheDirURL(rtl::OStringToOUString(OpenCLDevice::maCacheFolder, RTL_TEXTENCODING_UTF8)); osl::Directory aCacheDir(aCacheDirURL); osl::FileBase::RC status = aCacheDir.open(); if(status != osl::FileBase::E_None) @@ -117,15 +117,15 @@ void clearCache() } -OString OpenclDevice::maCacheFolder = getCacheFolder(); +OString OpenCLDevice::maCacheFolder = getCacheFolder(); -void OpenclDevice::registOpenclKernel() +void OpenCLDevice::registerOpenCLKernel() { if ( !gpuEnv.mnIsUserCreated ) memset( &gpuEnv, 0, sizeof(gpuEnv) ); } -void OpenclDevice::setKernelEnv( KernelEnv *envInfo ) +void OpenCLDevice::setKernelEnv( KernelEnv *envInfo ) { envInfo->mpkContext = gpuEnv.mpContext; envInfo->mpkCmdQueue = gpuEnv.mpCmdQueue; @@ -161,13 +161,13 @@ OString createFileName(cl_device_id deviceId, const char* clFileName) OString aString = OString(deviceName) + driverVersion + platformVersion; OString aHash = generateMD5(aString.getStr(), aString.getLength()); - return OpenclDevice::maCacheFolder + fileName + "-" + + return OpenCLDevice::maCacheFolder + fileName + "-" + aHash + ".bin"; } } -std::vector > OpenclDevice::binaryGenerated( const char * clFileName, cl_context context ) +std::vector > OpenCLDevice::binaryGenerated( const char * clFileName, cl_context context ) { size_t numDevices=0; @@ -210,7 +210,7 @@ std::vector > OpenclDevice::binaryGenerated( const return aGeneratedFiles; } -bool OpenclDevice::writeBinaryToFile( const OString& rFileName, const char* binary, size_t numBytes ) +bool OpenCLDevice::writeBinaryToFile( const OString& rFileName, const char* binary, size_t numBytes ) { clearCache(); osl::File file(rtl::OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8)); @@ -228,7 +228,7 @@ bool OpenclDevice::writeBinaryToFile( const OString& rFileName, const char* bina return true; } -bool OpenclDevice::generatBinFromKernelSource( cl_program program, const char * clFileName ) +bool OpenCLDevice::generatBinFromKernelSource( cl_program program, const char * clFileName ) { cl_uint numDevices; @@ -292,7 +292,7 @@ bool OpenclDevice::generatBinFromKernelSource( cl_program program, const char * return true; } -bool OpenclDevice::initOpenclAttr( OpenCLEnv * env ) +bool OpenCLDevice::initOpenCLAttr( OpenCLEnv * env ) { if ( gpuEnv.mnIsUserCreated ) return true; @@ -307,7 +307,7 @@ bool OpenclDevice::initOpenclAttr( OpenCLEnv * env ) return false; } -void OpenclDevice::releaseOpenclEnv( GPUEnv *gpuInfo ) +void OpenCLDevice::releaseOpenCLEnv( GPUEnv *gpuInfo ) { if ( !bIsInited ) { @@ -383,7 +383,7 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx) return false; } - OString aBuildLogFileURL = OpenclDevice::maCacheFolder + "kernel-build.log"; + OString aBuildLogFileURL = OpenCLDevice::maCacheFolder + "kernel-build.log"; osl::File aBuildLogFile(rtl::OStringToOUString(aBuildLogFileURL, RTL_TEXTENCODING_UTF8)); osl::FileBase::RC status = aBuildLogFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); @@ -402,7 +402,7 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx) } -bool OpenclDevice::buildProgramFromBinary(const char* buildOption, GPUEnv* gpuInfo, const char* filename, int idx) +bool OpenCLDevice::buildProgramFromBinary(const char* buildOption, GPUEnv* gpuInfo, const char* filename, int idx) { size_t numDevices; cl_int clStatus = clGetContextInfo( gpuInfo->mpContext, CL_CONTEXT_DEVICES, @@ -469,7 +469,7 @@ bool OpenclDevice::buildProgramFromBinary(const char* buildOption, GPUEnv* gpuIn return buildProgram(buildOption, gpuInfo, idx); } -bool OpenclDevice::initOpenclRunEnv( int argc ) +bool OpenCLDevice::initOpenCLRunEnv( int argc ) { if ( MAX_CLKERNEL_NUM <= 0 ) { @@ -480,9 +480,9 @@ bool OpenclDevice::initOpenclRunEnv( int argc ) if ( !bIsInited ) { - registOpenclKernel(); + registerOpenCLKernel(); //initialize devices, context, command_queue - bool status = initOpenclRunEnv( &gpuEnv ); + bool status = initOpenCLRunEnv( &gpuEnv ); if ( status ) { return true; @@ -546,7 +546,7 @@ void checkDeviceForDoubleSupport(cl_device_id deviceId, bool& bKhrFp64, bool& bA } -bool OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo ) +bool OpenCLDevice::initOpenCLRunEnv( GPUEnv *gpuInfo ) { size_t length; cl_int clStatus; @@ -678,7 +678,7 @@ bool OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo ) namespace { // based on crashes and hanging during kernel compilation -bool checkForKnownBadCompilers(const OpenclDeviceInfo& rInfo) +bool checkForKnownBadCompilers(const OpenCLDeviceInfo& rInfo) { struct { @@ -697,9 +697,9 @@ bool checkForKnownBadCompilers(const OpenclDeviceInfo& rInfo) return false; } -void createDeviceInfo(cl_device_id aDeviceId, OpenclPlatformInfo& rPlatformInfo) +void createDeviceInfo(cl_device_id aDeviceId, OpenCLPlatformInfo& rPlatformInfo) { - OpenclDeviceInfo aDeviceInfo; + OpenCLDeviceInfo aDeviceInfo; aDeviceInfo.device = aDeviceId; char pName[DEVICE_NAME_LENGTH]; @@ -757,7 +757,7 @@ void createDeviceInfo(cl_device_id aDeviceId, OpenclPlatformInfo& rPlatformInfo) rPlatformInfo.maDevices.push_back(aDeviceInfo); } -bool createPlatformInfo(cl_platform_id nPlatformId, OpenclPlatformInfo& rPlatformInfo) +bool createPlatformInfo(cl_platform_id nPlatformId, OpenCLPlatformInfo& rPlatformInfo) { rPlatformInfo.platform = nPlatformId; char pName[64]; @@ -812,9 +812,9 @@ size_t getOpenCLPlatformCount() return nPlatforms; } -const std::vector& fillOpenCLInfo() +const std::vector& fillOpenCLInfo() { - static std::vector aPlatforms; + static std::vector aPlatforms; if(!aPlatforms.empty()) return aPlatforms; @@ -838,7 +838,7 @@ const std::vector& fillOpenCLInfo() for(size_t i = 0; i < nPlatforms; ++i) { - OpenclPlatformInfo aPlatformInfo; + OpenCLPlatformInfo aPlatformInfo; if(createPlatformInfo(pPlatforms[i], aPlatformInfo)) aPlatforms.push_back(aPlatformInfo); } @@ -848,12 +848,12 @@ const std::vector& fillOpenCLInfo() namespace { -cl_device_id findDeviceIdByDeviceString(const OUString& rString, const std::vector& rPlatforms) +cl_device_id findDeviceIdByDeviceString(const OUString& rString, const std::vector& rPlatforms) { - std::vector::const_iterator it = rPlatforms.begin(), itEnd = rPlatforms.end(); + std::vector::const_iterator it = rPlatforms.begin(), itEnd = rPlatforms.end(); for(; it != itEnd; ++it) { - std::vector::const_iterator itr = it->maDevices.begin(), itrEnd = it->maDevices.end(); + std::vector::const_iterator itr = it->maDevices.begin(), itrEnd = it->maDevices.end(); for(; itr != itrEnd; ++itr) { OUString aDeviceId = it->maVendor + " " + itr->maName; @@ -876,7 +876,7 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, size_t& rDeviceId, size_ if(nState != CL_SUCCESS) return; - const std::vector& rPlatforms = fillOpenCLInfo(); + const std::vector& rPlatforms = fillOpenCLInfo(); for(size_t i = 0; i < rPlatforms.size(); ++i) { cl_platform_id platId = static_cast(rPlatforms[i].platform); @@ -898,7 +898,7 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, size_t& rDeviceId, size_ } -bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation) +bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation) { if(fillOpenCLInfo().empty()) return false; @@ -923,7 +923,7 @@ bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEv } - if(OpenclDevice::gpuEnv.mpDevID == pDeviceId) + if(OpenCLDevice::gpuEnv.mpDevID == pDeviceId) { // we don't need to change anything // still the same device @@ -962,18 +962,18 @@ bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEv return false; } - OpenclDevice::releaseOpenclEnv(&OpenclDevice::gpuEnv); + OpenCLDevice::releaseOpenCLEnv(&OpenCLDevice::gpuEnv); OpenCLEnv env; env.mpOclPlatformID = platformId; env.mpOclContext = context; env.mpOclDevsID = pDeviceId; env.mpOclCmdQueue = command_queue; - OpenclDevice::initOpenclAttr(&env); + OpenCLDevice::initOpenCLAttr(&env); // why do we need this at all? - OpenclDevice::gpuEnv.mpArryDevsID = (cl_device_id*) malloc( sizeof(cl_device_id) ); - OpenclDevice::gpuEnv.mpArryDevsID[0] = pDeviceId; - return !OpenclDevice::initOpenclRunEnv(0); + OpenCLDevice::gpuEnv.mpArryDevsID = (cl_device_id*) malloc( sizeof(cl_device_id) ); + OpenCLDevice::gpuEnv.mpArryDevsID[0] = pDeviceId; + return !OpenCLDevice::initOpenCLRunEnv(0); } void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& rPlatformId) @@ -982,7 +982,7 @@ void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& rPlatformId) if (status < 0) return; - cl_device_id id = OpenclDevice::gpuEnv.mpDevID; + cl_device_id id = OpenCLDevice::gpuEnv.mpDevID; findDeviceInfoFromDeviceId(id, rDeviceId, rPlatformId); } diff --git a/sc/source/core/opencl/openclwrapper.hxx b/sc/source/core/opencl/openclwrapper.hxx index ff8c2f654744..ab3e23362e17 100644 --- a/sc/source/core/opencl/openclwrapper.hxx +++ b/sc/source/core/opencl/openclwrapper.hxx @@ -147,28 +147,28 @@ struct DoubleVectorFormula int mnInputEndOffset; }; -class OpenclDevice +class OpenCLDevice { public: static GPUEnv gpuEnv; static bool bIsInited; static OString maCacheFolder; - static void registOpenclKernel(); - static bool initOpenclRunEnv( GPUEnv *gpu ); - static void releaseOpenclEnv( GPUEnv *gpuInfo ); - static bool initOpenclRunEnv( int argc ); + static void registerOpenCLKernel(); + static bool initOpenCLRunEnv( GPUEnv *gpu ); + static void releaseOpenCLEnv( GPUEnv *gpuInfo ); + static bool initOpenCLRunEnv( int argc ); static bool generatBinFromKernelSource( cl_program program, const char * clFileName ); static bool writeBinaryToFile( const OString& rName, const char* birary, size_t numBytes ); static std::vector > binaryGenerated( const char * clFileName, cl_context context); static bool buildProgramFromBinary(const char* buildOption, GPUEnv* gpuEnv, const char* filename, int idx); - static bool initOpenclAttr( OpenCLEnv * env ); + static bool initOpenCLAttr( OpenCLEnv * env ); static void setKernelEnv( KernelEnv *envInfo ); }; size_t getOpenCLPlatformCount(); -const std::vector& fillOpenCLInfo(); +const std::vector& fillOpenCLInfo(); /** * Used to set or switch between OpenCL devices. @@ -178,7 +178,7 @@ const std::vector& fillOpenCLInfo(); * * @return returns true if there is a valid opencl device that has been set up */ -bool switchOpenclDevice(const OUString* pDeviceId, bool bAutoSelect, +bool switchOpenCLDevice(const OUString* pDeviceId, bool bAutoSelect, bool bForceEvaluation); void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& rPlatformId); diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index a862b0c8da00..1445dd312624 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -33,8 +33,8 @@ #ifdef DISABLE_DYNLOADING extern "C" size_t getOpenCLPlatformCount(void); -extern "C" void fillOpenCLInfo(sc::OpenclPlatformInfo*, size_t); -extern "C" bool switchOpenClDevice(const OUString*, bool, bool); +extern "C" void fillOpenCLInfo(sc::OpenCLPlatformInfo*, size_t); +extern "C" bool switchOpenCLDevice(const OUString*, bool, bool); extern "C" sc::FormulaGroupInterpreter* createFormulaGroupOpenCLInterpreter(); extern "C" void getOpenCLDeviceInfo(size_t*, size_t*); @@ -528,8 +528,8 @@ static void SAL_CALL thisModule() {} typedef FormulaGroupInterpreter* (*__createFormulaGroupOpenCLInterpreter)(void); typedef size_t (*__getOpenCLPlatformCount)(void); -typedef void (*__fillOpenCLInfo)(OpenclPlatformInfo*, size_t); -typedef bool (*__switchOpenClDevice)(const OUString*, bool, bool); +typedef void (*__fillOpenCLInfo)(OpenCLPlatformInfo*, size_t); +typedef bool (*__switchOpenCLDevice)(const OUString*, bool, bool); typedef void (*__getOpenCLDeviceInfo)(size_t*, size_t*); #endif @@ -585,7 +585,7 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic() return msInstance; } -void FormulaGroupInterpreter::fillOpenCLInfo(std::vector& rPlatforms) +void FormulaGroupInterpreter::fillOpenCLInfo(std::vector& rPlatforms) { #if !HAVE_FEATURE_OPENCL (void) rPlatforms; @@ -607,7 +607,7 @@ void FormulaGroupInterpreter::fillOpenCLInfo(std::vector& rP if (!fn) return; - std::vector aPlatforms(nPlatforms); + std::vector aPlatforms(nPlatforms); reinterpret_cast<__fillOpenCLInfo>(fn)(&aPlatforms[0], aPlatforms.size()); rPlatforms.swap(aPlatforms); #else @@ -615,7 +615,7 @@ void FormulaGroupInterpreter::fillOpenCLInfo(std::vector& rP if (!nPlatforms) return; - std::vector aPlatforms(nPlatforms); + std::vector aPlatforms(nPlatforms); ::fillOpenCLInfo(&aPlatforms[0], aPlatforms.size()); rPlatforms.swap(aPlatforms); #endif @@ -645,15 +645,15 @@ bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool if (!pModule) return false; - oslGenericFunction fn = pModule->getFunctionSymbol("switchOpenClDevice"); + oslGenericFunction fn = pModule->getFunctionSymbol("switchOpenCLDevice"); if (!fn) return false; - bool bSuccess = reinterpret_cast<__switchOpenClDevice>(fn)(&rDeviceId, bAutoSelect, bForceEvaluation); + bool bSuccess = reinterpret_cast<__switchOpenCLDevice>(fn)(&rDeviceId, bAutoSelect, bForceEvaluation); if(!bSuccess) return false; #else - bool bSuccess = switchOpenClDevice(&rDeviceId, bAutoSelect, bForceEvaluation); + bool bSuccess = switchOpenCLDevice(&rDeviceId, bAutoSelect, bForceEvaluation); if(!bSuccess) return false; #endif diff --git a/sc/source/core/tool/platforminfo.cxx b/sc/source/core/tool/platforminfo.cxx index 719fda90c582..3f90b14f46fb 100644 --- a/sc/source/core/tool/platforminfo.cxx +++ b/sc/source/core/tool/platforminfo.cxx @@ -12,7 +12,7 @@ namespace sc { -OpenclDeviceInfo::OpenclDeviceInfo() +OpenCLDeviceInfo::OpenCLDeviceInfo() : device(0) , mnMemory(0) , mnComputeUnits(0) @@ -20,7 +20,7 @@ OpenclDeviceInfo::OpenclDeviceInfo() { } -OpenclPlatformInfo::OpenclPlatformInfo() +OpenCLPlatformInfo::OpenCLPlatformInfo() : platform(NULL) { } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 12a62b903fe7..34fc04bffb72 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -220,7 +220,7 @@ void ScCalcOptionsDialog::setValueAt(size_t nPos, const OUString &rValue) #if HAVE_FEATURE_OPENCL -void ScCalcOptionsDialog::fillOpenclList() +void ScCalcOptionsDialog::fillOpenCLList() { mpOpenclInfoList->SetUpdateMode(false); mpOpenclInfoList->Clear(); @@ -231,10 +231,10 @@ void ScCalcOptionsDialog::fillOpenclList() SvTreeListEntry* pSelectedEntry = NULL; sc::FormulaGroupInterpreter::fillOpenCLInfo(maPlatformInfo); - for(std::vector::iterator it = maPlatformInfo.begin(), + for(std::vector::iterator it = maPlatformInfo.begin(), itEnd = maPlatformInfo.end(); it != itEnd; ++it) { - for(std::vector::iterator + for(std::vector::iterator itr = it->maDevices.begin(), itrEnd = it->maDevices.end(); itr != itrEnd; ++itr) { OUString aDeviceId = it->maVendor + " " + itr->maName; @@ -296,7 +296,7 @@ void ScCalcOptionsDialog::FillOptionsList() #if HAVE_FEATURE_OPENCL pModel->Insert(createBoolItem(maCaptionOpenCLEnabled,maConfig.mbOpenCLEnabled)); - fillOpenclList(); + fillOpenCLList(); mpBtnAutomaticSelectionFalse->Check(!maConfig.mbOpenCLAutoSelect); mpBtnAutomaticSelectionTrue->Check(maConfig.mbOpenCLAutoSelect); @@ -412,7 +412,7 @@ void ScCalcOptionsDialog::SelectionChanged() else mpOpenclInfoList->GetParent()->Disable(); - OpenclAutomaticSelectionChanged(); + OpenCLAutomaticSelectionChanged(); } if ( bValue ) @@ -493,7 +493,7 @@ void ScCalcOptionsDialog::ListOptionValueChanged() } } -void ScCalcOptionsDialog::OpenclAutomaticSelectionChanged() +void ScCalcOptionsDialog::OpenCLAutomaticSelectionChanged() { bool bValue = mpBtnAutomaticSelectionTrue->IsChecked(); if(bValue) @@ -511,7 +511,7 @@ void ScCalcOptionsDialog::SelectedDeviceChanged() if(!pEntry) return; - sc::OpenclDeviceInfo* pInfo = reinterpret_cast(pEntry->GetUserData()); + sc::OpenCLDeviceInfo* pInfo = reinterpret_cast(pEntry->GetUserData()); if(pInfo) { mpFtFrequency->SetText(OUString::number(pInfo->mnFrequency)); @@ -556,7 +556,7 @@ void ScCalcOptionsDialog::RadioValueChanged() mpOpenclInfoList->GetParent()->Enable(); else mpOpenclInfoList->GetParent()->Disable(); - OpenclAutomaticSelectionChanged(); + OpenCLAutomaticSelectionChanged(); break; } @@ -619,7 +619,7 @@ IMPL_LINK_NOARG(ScCalcOptionsDialog, BtnToggleHdl) IMPL_LINK_NOARG(ScCalcOptionsDialog, BtnAutomaticSelectHdl) { - OpenclAutomaticSelectionChanged(); + OpenCLAutomaticSelectionChanged(); return 0; } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index a26b34437ba7..adac98a09681 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -43,10 +43,10 @@ private: void SelectionChanged(); void ListOptionValueChanged(); void RadioValueChanged(); - void OpenclAutomaticSelectionChanged(); + void OpenCLAutomaticSelectionChanged(); void SelectedDeviceChanged(); #if HAVE_FEATURE_OPENCL - void fillOpenclList(); + void fillOpenCLList(); #endif OUString toString(formula::FormulaGrammar::AddressConvention eConv) const; @@ -100,7 +100,7 @@ private: ScCalcConfig maConfig; #if HAVE_FEATURE_OPENCL - std::vector maPlatformInfo; + std::vector maPlatformInfo; #endif bool mbSelectedEmptyStringAsZero; diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index de1465282db1..f553e5153923 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -2364,7 +2364,7 @@ void ScModelObj::selectOpenCLDevice( sal_Int32 nPlatform, sal_Int32 nDevice ) if(nPlatform < 0 || nDevice < 0) throw uno::RuntimeException(); - std::vector aPlatformInfo; + std::vector aPlatformInfo; sc::FormulaGroupInterpreter::fillOpenCLInfo(aPlatformInfo); if(size_t(nPlatform) >= aPlatformInfo.size()) throw uno::RuntimeException(); @@ -2397,7 +2397,7 @@ sal_Int32 ScModelObj::getDeviceID() uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms() throw (uno::RuntimeException, std::exception) { - std::vector aPlatformInfo; + std::vector aPlatformInfo; sc::FormulaGroupInterpreter::fillOpenCLInfo(aPlatformInfo); uno::Sequence aRet(aPlatformInfo.size()); @@ -2409,7 +2409,7 @@ uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms() aRet[i].Devices.realloc(aPlatformInfo[i].maDevices.size()); for(size_t j = 0; j < aPlatformInfo[i].maDevices.size(); ++j) { - const sc::OpenclDeviceInfo& rDevice = aPlatformInfo[i].maDevices[j]; + const sc::OpenCLDeviceInfo& rDevice = aPlatformInfo[i].maDevices[j]; aRet[i].Devices[j].Name = rDevice.maName; aRet[i].Devices[j].Vendor = rDevice.maVendor; aRet[i].Devices[j].Driver = rDevice.maDriver; -- cgit