sc/source/core/opencl/openclwrapper.cxx | 7 ++-----
sc/source/core/opencl/openclwrapper.hxx | 3 +++
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9dfb46ae335c46bdf4b2e9df52cc443519230705
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Jul 11 10:05:55 2013 +0300
WaE: comparison of integers of different signs
Change-Id: I59577fbe8c3a59bb56d32a6c441a3b655f97a753
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 1e0719b..26c4c80 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -2096,7 +2096,7 @@ static cl_mem allocateDoubleBuffer(KernelEnv &rEnv, const
double *_pValues,
nElements * sizeof(double), NULL, pStatus);
fp_t *pValues = (fp_t
*)clEnqueueMapBuffer(rEnv.mpkCmdQueue,xValues,CL_TRUE,CL_MAP_WRITE,0,
nElements *
sizeof(fp_t),0,NULL,NULL,NULL);
- for(int i=0;i<nElements;i++)
+ for(size_t i=0;i<nElements;i++)
pValues[i] = (fp_t)_pValues[i];
clEnqueueUnmapMemObject(rEnv.mpkCmdQueue,xValues,pValues,0,NULL,NULL);
@@ -2173,7 +2173,7 @@ double *OclCalc::OclSimpleDeltaOperation(OpCode eOp,
const double *pOpArray,
fp_t *pOutput = (fp_t
*)clEnqueueMapBuffer(kEnv.mpkCmdQueue,outputCl,CL_TRUE,
CL_MAP_READ,0,nElements*sizeof(fp_t),
0,NULL,NULL,NULL);
- for(int i = 0; i < nElements; i++)
+ for(size_t i = 0; i < nElements; i++)
pResult[i] = (double)pOutput[i];
clEnqueueUnmapMemObject(kEnv.mpkCmdQueue,outputCl,pOutput,0,NULL,NULL);
commit f7d2e3e08ca9de9424f58d9600ec88077d1a196f
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Jul 11 10:03:17 2013 +0300
Again, bin no-op call of clGetCommandQueueInfo(CL_QUEUE_THREAD_HANDLE_AMD)
Besides, CL_QUEUE_THREAD_HANDLE_AMD is not defined any more in
openclwrappers.hxx.
Change-Id: I11fd3d9ea873cf8c9d62b3c2653cfb5e0bf4a437
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 0c94721..1e0719b 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -743,9 +743,6 @@ int OpenclDevice::InitOpenclRunEnv(GPUEnv *gpuInfo)
}
}
- status = clGetCommandQueueInfo(gpuInfo->mpCmdQueue,
- CL_QUEUE_THREAD_HANDLE_AMD, 0, NULL, NULL);
-
return 0;
}
commit a69e8fc686c4e6ec996ba91e61e3021e8f9e0d60
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Jul 11 10:01:27 2013 +0300
Apple still has cl.h in a different path, fix conflict mis-resolution
Change-Id: I436e46d52659b28a3ecf5ad1a6366b0a79f062c4
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 62ad389..d83b7c8 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -14,7 +14,11 @@
#include <formula/opcode.hxx>
#include <sal/detail/log.h>
#include <cassert>
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
#include <CL/cl.h>
+#endif
#if defined(_MSC_VER)
#ifndef strcasecmp
commit cf1de6b8ceb3eb5b4b25af6167df62468ecefb3f
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Jul 11 09:58:25 2013 +0300
Remove superfluous #endif
Change-Id: I5fcf215e7d044711f593f1c8099c0fad13d22141
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index fe62554..62ad389 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -15,7 +15,6 @@
#include <sal/detail/log.h>
#include <cassert>
#include <CL/cl.h>
-#endif
#if defined(_MSC_VER)
#ifndef strcasecmp
commit cf04b77f08f3729201597f0acd82fc53e31795cd
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Jul 11 09:57:59 2013 +0300
chmod -x
Change-Id: I5f8bdd55e361e97e21e61cf28a48548477a7522a
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/opencl/oclkernels.hxx
b/sc/source/core/opencl/oclkernels.hxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
old mode 100755
new mode 100644
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
