[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source

[I-Jui Sung (Ray)]

 sc/source/core/opencl/formulagroupcl.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 004dbafbd700b6074f20b3061d0e25e169132b3e
Author: I-Jui (Ray) Sung <ray at multicorewareinc.com>
Date:   Sat Nov 16 02:09:18 2013 -0600

    GPU Calc: pass the right argument size for reduction kernels in SumIfs
    
    Change-Id: Ib8fab8eacddbeb37795ad45f026559bdde0d43f7

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 64fe95e..36517c7 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -192,6 +192,7 @@ public:
             throw OpenCLError(err);
         return 1;
     }
+    virtual cl_mem GetCLBuffer(void) const { return NULL; }
 };
 
 class DynamicKernelPiArgument: public DynamicKernelArgument
@@ -1060,7 +1061,8 @@ public:
 
                     // set kernel arg of reduction kernel
                 for (size_t j=0; j< vclmem.size(); j++){
-                    err = clSetKernelArg(redKernel, j, sizeof(cl_mem),
+                    err = clSetKernelArg(redKernel, j,
+                            vclmem[j]?sizeof(cl_mem):sizeof(double),
                             (void *)&vclmem[j]);
                     if (CL_SUCCESS != err)
                         throw OpenCLError(err);