Clean up confusing OpenCL code a bit

Get rid of the silly OpenCLDevice class that had only static members. We can
as well just use namespacing. Remove functions only used internally in
openclwrapper.cxx from the now public openclwrapper.hxx header.

Change-Id: If7336edd262c772564dc13e64113d72d0b52428c

1 files changed, 20 insertions, 20 deletions

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 0615410c0ad3..6ac2a5fb23fc 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -114,7 +114,7 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int, cl_program )
     }
     // Obtain cl context
     KernelEnv kEnv;
-    ::opencl::OpenCLDevice::setKernelEnv(&kEnv);
+    ::opencl::setKernelEnv(&kEnv);
     cl_int err;
     if (pHostBuffer)
     {
@@ -205,7 +205,7 @@ public:
         // marshaling
         // Obtain cl context
         KernelEnv kEnv;
-        ::opencl::OpenCLDevice::setKernelEnv(&kEnv);
+        ::opencl::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)
@@ -389,7 +389,7 @@ size_t DynamicKernelStringArgument::Marshal( cl_kernel k, int argno, int, cl_pro
     FormulaToken* ref = mFormulaTree->GetFormulaToken();
     // Obtain cl context
     KernelEnv kEnv;
-    ::opencl::OpenCLDevice::setKernelEnv(&kEnv);
+    ::opencl::setKernelEnv(&kEnv);
     cl_int err;
     formula::VectorRefArray vRef;
     size_t nStrings = 0;
@@ -1132,7 +1132,7 @@ public:
         assert(Base::mpClmem == NULL);
         // Obtain cl context
         KernelEnv kEnv;
-        ::opencl::OpenCLDevice::setKernelEnv(&kEnv);
+        ::opencl::setKernelEnv(&kEnv);
         cl_int err;
         size_t nInput = mpDVR->GetArrayLength();
         size_t nCurWindowSize = mpDVR->GetRefRowSize();
@@ -1913,7 +1913,7 @@ public:
         {
             // Obtain cl context
             KernelEnv kEnv;
-            ::opencl::OpenCLDevice::setKernelEnv(&kEnv);
+            ::opencl::setKernelEnv(&kEnv);
             cl_int err;
             cl_mem pClmem2;
 
@@ -1971,7 +1971,7 @@ public:
         {
             // Obtain cl context
             KernelEnv kEnv;
-            ::opencl::OpenCLDevice::setKernelEnv(&kEnv);
+            ::opencl::setKernelEnv(&kEnv);
             cl_int err;
             DynamicKernelArgument* Arg = mvSubArguments[0].get();
             DynamicKernelSlidingArgument<VectorRef>* slidingArgPtr =
@@ -3282,11 +3282,11 @@ public:
                                                                DynamicKernelSoPArguments>(mpRoot, new OpNop);
 
         std::stringstream decl;
-        if (::opencl::OpenCLDevice::gpuEnv.mnKhrFp64Flag)
+        if (::opencl::gpuEnv.mnKhrFp64Flag)
         {
             decl << "#pragma OPENCL EXTENSION cl_khr_fp64: enable\n";
         }
-        else if (::opencl::OpenCLDevice::gpuEnv.mnAmdFp64Flag)
+        else if (::opencl::gpuEnv.mnAmdFp64Flag)
         {
             decl << "#pragma OPENCL EXTENSION cl_amd_fp64: enable\n";
         }
@@ -3355,7 +3355,7 @@ public:
     {
         // Obtain cl context
         KernelEnv kEnv;
-        ::opencl::OpenCLDevice::setKernelEnv(&kEnv);
+        ::opencl::setKernelEnv(&kEnv);
         cl_int err;
         // The results
         mpResClmem = clCreateBuffer(kEnv.mpkContext,
@@ -3417,7 +3417,7 @@ void DynamicKernel::CreateKernel()
     // Compile kernel here!!!
     // Obtain cl context
     KernelEnv kEnv;
-    ::opencl::OpenCLDevice::setKernelEnv(&kEnv);
+    ::opencl::setKernelEnv(&kEnv);
     const char* src = mFullProgramSrc.c_str();
     static std::string lastOneKernelHash = "";
     static std::string lastSecondKernelHash = "";
@@ -3439,11 +3439,11 @@ void DynamicKernel::CreateKernel()
         {
             clReleaseProgram(lastSecondProgram);
         }
-        if (::opencl::OpenCLDevice::buildProgramFromBinary("",
-                &::opencl::OpenCLDevice::gpuEnv, KernelHash.c_str(), 0))
+        if (::opencl::buildProgramFromBinary("",
+                &::opencl::gpuEnv, KernelHash.c_str(), 0))
         {
-            mpProgram = ::opencl::OpenCLDevice::gpuEnv.mpArryPrograms[0];
-            ::opencl::OpenCLDevice::gpuEnv.mpArryPrograms[0] = NULL;
+            mpProgram = ::opencl::gpuEnv.mpArryPrograms[0];
+            ::opencl::gpuEnv.mpArryPrograms[0] = NULL;
         }
         else
         {
@@ -3452,7 +3452,7 @@ void DynamicKernel::CreateKernel()
             if (err != CL_SUCCESS)
                 throw OpenCLError(err, __FILE__, __LINE__);
             err = clBuildProgram(mpProgram, 1,
-                ::opencl::OpenCLDevice::gpuEnv.mpArryDevsID, "", NULL, NULL);
+                ::opencl::gpuEnv.mpArryDevsID, "", NULL, NULL);
             if (err != CL_SUCCESS)
             {
 #if OSL_DEBUG_LEVEL > 0
@@ -3460,7 +3460,7 @@ void DynamicKernel::CreateKernel()
                 {
                     cl_build_status stat;
                     cl_int e = clGetProgramBuildInfo(
-                        mpProgram, ::opencl::OpenCLDevice::gpuEnv.mpArryDevsID[0],
+                        mpProgram, ::opencl::gpuEnv.mpArryDevsID[0],
                         CL_PROGRAM_BUILD_STATUS, sizeof(cl_build_status),
                         &stat, 0);
                     SAL_WARN_IF(
@@ -3472,7 +3472,7 @@ void DynamicKernel::CreateKernel()
                     {
                         size_t n;
                         e = clGetProgramBuildInfo(
-                            mpProgram, ::opencl::OpenCLDevice::gpuEnv.mpArryDevsID[0],
+                            mpProgram, ::opencl::gpuEnv.mpArryDevsID[0],
                             CL_PROGRAM_BUILD_LOG, 0, 0, &n);
                         SAL_WARN_IF(
                             e != CL_SUCCESS || n == 0, "sc.opencl",
@@ -3483,7 +3483,7 @@ void DynamicKernel::CreateKernel()
                         {
                             std::vector<char> log(n);
                             e = clGetProgramBuildInfo(
-                                mpProgram, ::opencl::OpenCLDevice::gpuEnv.mpArryDevsID[0],
+                                mpProgram, ::opencl::gpuEnv.mpArryDevsID[0],
                                 CL_PROGRAM_BUILD_LOG, n, &log[0], 0);
                             SAL_WARN_IF(
                                 e != CL_SUCCESS || n == 0, "sc.opencl",
@@ -3502,7 +3502,7 @@ void DynamicKernel::CreateKernel()
                 throw OpenCLError(err, __FILE__, __LINE__);
             }
             // Generate binary out of compiled kernel.
-            ::opencl::OpenCLDevice::generatBinFromKernelSource(mpProgram,
+            ::opencl::generatBinFromKernelSource(mpProgram,
                 (mKernelSignature + GetMD5()).c_str());
         }
         lastSecondKernelHash = lastOneKernelHash;
@@ -3668,7 +3668,7 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
     {
         // Obtain cl context
         KernelEnv kEnv;
-        ::opencl::OpenCLDevice::setKernelEnv(&kEnv);
+        ::opencl::setKernelEnv(&kEnv);
         // Run the kernel.
         pKernel->Launch(xGroup->mnLength);
         // Map results back