Merge pull request #181 from gongzg/master

OpenCL: Avoid incorrect flag when create ocl memory object.
viennacl · Mar 3, 2016 · cdcf992 · cdcf992
2 parents b0ee36d + 04f1063
commit cdcf992
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/viennacl/ocl/context.hpp b/viennacl/ocl/context.hpp
@@ -204,7 +204,7 @@ class context
 #if defined(VIENNACL_DEBUG_ALL) || defined(VIENNACL_DEBUG_CONTEXT)
     std::cout << "ViennaCL: Creating memory of size " << size << " for context " << h_ << " (unsafe, returning cl_mem directly)" << std::endl;
 #endif
-    if (ptr)
+    if (ptr && !(flags & CL_MEM_USE_HOST_PTR))
       flags |= CL_MEM_COPY_HOST_PTR;
     cl_int err;
     cl_mem mem = clCreateBuffer(h_.get(), flags, size, ptr, &err);