Inline setting of QCLVector<T> kernel args.

2 files changed, 7 insertions, 14 deletions

diff --git a/src/opencl/qclkernel.cpp b/src/opencl/qclkernel.cpp
index c4fe70c..942ef23 100644
--- a/src/opencl/qclkernel.cpp
+++ b/src/opencl/qclkernel.cpp
@@ -675,10 +675,6 @@ void QCLKernel::setArg(int index, const QMatrix4x4 &value)
     according to the type of memory object represented by \a value.
 */
 
-#if defined(qdoc)
-
-// Generate nicer qdoc output.
-
 /*!
     \fn void QCLKernel::setArg(int index, const QCLVector<T> &value)
 
@@ -688,16 +684,6 @@ void QCLKernel::setArg(int index, const QMatrix4x4 &value)
     to a buffer.
 */
 
-#else
-
-void QCLKernel::setArg(int index, const QCLVectorBase &value)
-{
-    cl_mem id = value.kernelArg();
-    clSetKernelArg(m_kernelId, index, sizeof(id), &id);
-}
-
-#endif
-
 /*!
     \fn void QCLKernel::setArg(int index, const QCLSampler &value)
 
diff --git a/src/opencl/qclkernel.h b/src/opencl/qclkernel.h
index ec8ea27..b03676b 100644
--- a/src/opencl/qclkernel.h
+++ b/src/opencl/qclkernel.h
@@ -47,6 +47,7 @@
 #include "qclworksize.h"
 #include "qclmemoryobject.h"
 #include "qclsampler.h"
+#include "qclvector.h"
 #include <QtCore/qstring.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qtconcurrentrun.h>
@@ -380,6 +381,12 @@ inline void QCLKernel::setArg(int index, const QCLMemoryObject &value)
     clSetKernelArg(m_kernelId, index, sizeof(id), &id);
 }
 
+inline void QCLKernel::setArg(int index, const QCLVectorBase &value)
+{
+    cl_mem id = value.kernelArg();
+    clSetKernelArg(m_kernelId, index, sizeof(id), &id);
+}
+
 inline void QCLKernel::setArg(int index, const QCLSampler &value)
 {
     cl_sampler id = value.samplerId();