[pocl] 11/14: fix detection of image and sampler arguments

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository pocl.

commit f13edcbdf9dcc5b8622e0996f1f55e803328dbea
Author: James Price <J.Price at bristol.ac.uk>
Date:   Sat Oct 31 15:44:41 2015 +0000

    fix detection of image and sampler arguments
---
 debian/changelog                    |  2 ++
 debian/patches/fix-image-args.patch | 15 +++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7bfdb80..7f8ee13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ pocl (0.11-1) UNRELEASED; urgency=medium
   * Drop the -dbg package in favor of autogenerated -dbgsym packages.
   * Update symbols files for amd64 and i386.
   * llvm-config --system-libs is only needed with static llvm.
+  * Fix detection of image and sampler arguments, thanks to James Price.
+    (Closes: #799322)
   * Put package under "Debian OpenCL Maintainers" team maintenance.
   * Add Vincent Danjean and myself to Uploaders.
   * Bump Standards-Version to 3.9.8 (no changes needed).
diff --git a/debian/patches/fix-image-args.patch b/debian/patches/fix-image-args.patch
new file mode 100644
index 0000000..caf145f
--- /dev/null
+++ b/debian/patches/fix-image-args.patch
@@ -0,0 +1,15 @@
+Description: Fix detection of images when checking kernel arguments.
+Author: James Price <j.price at bristol.ac.uk>
+Last-Update: 2015-10-31
+
+--- a/lib/llvmopencl/LLVMUtils.h
++++ b/lib/llvmopencl/LLVMUtils.h
+@@ -64,7 +64,7 @@
+ is_image_type(const llvm::Type& t) 
+ {
+   if (t.isPointerTy() && t.getPointerElementType()->isStructTy()) {
+-    llvm::StringRef name = t.getPointerElementType()->getStructName().str();
++    llvm::StringRef name = t.getPointerElementType()->getStructName();
+     if (name.startswith("opencl.image2d_t") || name.startswith("opencl.image3d_t") || 
+         name.startswith("opencl.image1d_t") || name.startswith("struct.dev_image_t"))
+       return true;
diff --git a/debian/patches/series b/debian/patches/series
index 749be3f..7ee7fa8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 freebsd-compat.patch
 fix-configure-for-debian-archs.patch
 llvm-system-libs.patch
+fix-image-args.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git