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

Markus Mohrhard markus.mohrhard at googlemail.com
Mon Sep 16 16:58:59 PDT 2013


 sc/source/core/opencl/openclwrapper.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit da5711cffb02aff91a20fd4d0d12ebcd8e5aabc2
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Sep 16 21:05:41 2013 +0200

    reintroduce changes from Tor
    
    Change-Id: I3b32e6754f8b86e7875ff6dd09b4dd0f38f8df4e

diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx
index b99dd12..9519018 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -268,7 +268,8 @@ int OpenclDevice::generatBinFromKernelSource( cl_program program, const char * c
 {
     unsigned int i = 0;
     cl_int clStatus;
-    size_t *binarySizes, numDevices;
+    size_t *binarySizes;
+    cl_uint numDevices;
     cl_device_id *mpArryDevsID;
     char **binaries, *str = NULL;
 
@@ -451,7 +452,7 @@ int OpenclDevice::compileKernelFile( GPUEnv *gpuInfo, const char *buildOption )
     const char *source;
     size_t source_size[1];
     int b_error, binary_status, binaryExisted, idx;
-    size_t numDevices;
+    cl_uint numDevices;
     cl_device_id *mpArryDevsID;
     FILE *fd, *fd1;
     const char* filename = "kernel.cl";


More information about the Libreoffice-commits mailing list