[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source

Markus Mohrhard markus.mohrhard at googlemail.com
Mon Sep 16 19:54:47 PDT 2013


 sc/source/core/opencl/openclwrapper.cxx |   12 ------------
 sc/source/core/opencl/openclwrapper.hxx |    1 -
 2 files changed, 13 deletions(-)

New commits:
commit 4adf00e5e5ab7bc96202ff3751feac5f6cbaf255
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 17 04:38:34 2013 +0200

    we no longer use that method for initializing opencl
    
    Change-Id: I779adb453cfe91328d5583f990b7c57d482fb7dc

diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx
index 7c245b9..3994029 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -77,18 +77,6 @@ OString generateHashForSource()
 
 OString OpenclDevice::maSourceHash = generateHashForSource();
 
-int OpenclDevice::initEnv()
-{
-    // TODO: This part needs more platform specific handling.  On Windows,
-    // the GPU Driver itself  installs OpenCL.dll in the system folder.
-    int status = clewInit(OPENCL_DLL_NAME);
-    if (status < 0)
-        return 1;
-
-    initOpenclRunEnv( 0 );
-    return 1;
-}
-
 int OpenclDevice::releaseOpenclRunEnv()
 {
     releaseOpenclEnv( &gpuEnv );
diff --git a/sc/source/core/opencl/openclwrapper.hxx b/sc/source/core/opencl/openclwrapper.hxx
index 7677f4d..057f02b 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -162,7 +162,6 @@ class OpenclDevice
 public:
     static GPUEnv gpuEnv;
     static int isInited;
-    static int initEnv();
     static OString maSourceHash;
     static int registOpenclKernel();
     static int releaseOpenclRunEnv();


More information about the Libreoffice-commits mailing list