[arrayfire] 169/248: Style fixes
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:54:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.
commit 0b90a215c1aaf2e8160c009a42e992c958fe33d4
Author: pradeep <pradeep at arrayfire.com>
Date: Mon Nov 2 11:30:07 2015 -0500
Style fixes
---
src/backend/opencl/image.cpp | 4 ----
src/backend/opencl/kernel/orb.hpp | 1 -
src/backend/opencl/kernel/sift_nonfree.hpp | 1 -
3 files changed, 6 deletions(-)
diff --git a/src/backend/opencl/image.cpp b/src/backend/opencl/image.cpp
index 1ee886b..d48593e 100644
--- a/src/backend/opencl/image.cpp
+++ b/src/backend/opencl/image.cpp
@@ -45,16 +45,12 @@ void copy_image(const Array<T> &in, const fg::Image* image)
} else {
CheckGL("Begin OpenCL fallback-resource copy");
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, image->pbo());
- CheckGL("1Begin OpenCL fallback-resource copy");
glBufferData(GL_PIXEL_UNPACK_BUFFER, image->size(), 0, GL_STREAM_DRAW);
- CheckGL("2Begin OpenCL fallback-resource copy");
GLubyte* ptr = (GLubyte*)glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
- CheckGL("3Begin OpenCL fallback-resource copy");
if (ptr) {
getQueue().enqueueReadBuffer(*in.get(), CL_TRUE, 0, image->size(), ptr);
glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
}
- CheckGL("4Begin OpenCL fallback-resource copy");
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
CheckGL("End OpenCL fallback-resource copy");
}
diff --git a/src/backend/opencl/kernel/orb.hpp b/src/backend/opencl/kernel/orb.hpp
index be46a59..871370d 100644
--- a/src/backend/opencl/kernel/orb.hpp
+++ b/src/backend/opencl/kernel/orb.hpp
@@ -484,7 +484,6 @@ void orb(unsigned* out_feat,
getQueue().enqueueCopyBuffer(*d_score_pyr[i], *score_out.data, 0, offset*sizeof(float), feat_pyr[i] * sizeof(float));
getQueue().enqueueCopyBuffer(*d_ori_pyr[i], *ori_out.data, 0, offset*sizeof(float), feat_pyr[i] * sizeof(float));
getQueue().enqueueCopyBuffer(*d_size_pyr[i], *size_out.data, 0, offset*sizeof(float), feat_pyr[i] * sizeof(float));
-
getQueue().enqueueCopyBuffer(*d_desc_pyr[i], *desc_out.data, 0, offset*8*sizeof(unsigned), feat_pyr[i] * 8 * sizeof(unsigned));
bufferFree(d_x_pyr[i]);
diff --git a/src/backend/opencl/kernel/sift_nonfree.hpp b/src/backend/opencl/kernel/sift_nonfree.hpp
index dfb2ad3..c28f432 100644
--- a/src/backend/opencl/kernel/sift_nonfree.hpp
+++ b/src/backend/opencl/kernel/sift_nonfree.hpp
@@ -801,7 +801,6 @@ void sift(unsigned* out_feat,
getQueue().enqueueCopyBuffer(*d_response_pyr[i], *score_out.data, 0, offset*sizeof(float), feat_pyr[i] * sizeof(float));
getQueue().enqueueCopyBuffer(*d_ori_pyr[i], *ori_out.data, 0, offset*sizeof(float), feat_pyr[i] * sizeof(float));
getQueue().enqueueCopyBuffer(*d_size_pyr[i], *size_out.data, 0, offset*sizeof(float), feat_pyr[i] * sizeof(float));
-
getQueue().enqueueCopyBuffer(*d_desc_pyr[i], *desc_out.data, 0, offset*desc_len*sizeof(unsigned), feat_pyr[i] * desc_len * sizeof(unsigned));
bufferFree(d_x_pyr[i]);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list