[Pkg-opencl-devel] [beignet] 11/47: Imported Debian patch 0.1+git20130422+003fac5-2

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository beignet.

commit 83c12acefb79a31a232ac2cf7fe038b7f26d32f2
Author: Simon Richter <sjr at debian.org>
Date:   Mon Apr 22 18:26:01 2013 +0200

    Imported Debian patch 0.1+git20130422+003fac5-2
---
 debian/changelog       |  7 +++++++
 debian/patches/fminmax | 19 +++++++++++++++++++
 debian/patches/select  | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series  |  2 ++
 4 files changed, 76 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9d14052..a53f592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+beignet (0.1+git20130422+003fac5-2) experimental; urgency=low
+
+  * Add patch for select()
+  * Add patch for fmin() / fmax()
+
+ -- Simon Richter <sjr at debian.org>  Mon, 22 Apr 2013 18:26:01 +0200
+
 beignet (0.1+git20130422+003fac5-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/patches/fminmax b/debian/patches/fminmax
new file mode 100644
index 0000000..03db57c
--- /dev/null
+++ b/debian/patches/fminmax
@@ -0,0 +1,19 @@
+commit 09d513910bd7a4d523424a0666494c691aa4c824
+Author: Simon Richter <Simon.Richter at hogyros.de>
+Date:   Mon Apr 22 18:59:33 2013 +0200
+
+    Add vector fmin/fmax
+
+diff --git a/backend/src/ocl_stdlib.h b/backend/src/ocl_stdlib.h
+index ce0c5f9..79616b8 100644
+--- a/backend/src/ocl_stdlib.h
++++ b/backend/src/ocl_stdlib.h
+@@ -684,6 +684,8 @@ DECL_VECTOR_1OP(__gen_ocl_internal_log10, float);
+   }
+ DECL_VECTOR_2OP(min, float);
+ DECL_VECTOR_2OP(max, float);
++DECL_VECTOR_2OP(__gen_ocl_internal_fmin, float);
++DECL_VECTOR_2OP(__gen_ocl_internal_fmax, float);
+ DECL_VECTOR_2OP(fmod, float);
+ DECL_VECTOR_2OP(powr, float);
+ #undef DECL_VECTOR_2OP
diff --git a/debian/patches/select b/debian/patches/select
new file mode 100644
index 0000000..a31839e
--- /dev/null
+++ b/debian/patches/select
@@ -0,0 +1,48 @@
+commit 17fbbe5119e5d356d2df5b72fa04abbd2c1f5b3b
+Author: Simon Richter <Simon.Richter at hogyros.de>
+Date:   Mon Apr 22 18:19:07 2013 +0200
+
+    Add missing select() overloads
+    
+    Both signed and unsigned types are allowed as the condition type,
+    regardless of the true/false branch types.
+
+Index: beignet-0.1+git20130422+003fac5/backend/src/ocl_stdlib.h
+===================================================================
+--- beignet-0.1+git20130422+003fac5.orig/backend/src/ocl_stdlib.h	2013-04-22 12:04:32.000000000 +0200
++++ beignet-0.1+git20130422+003fac5/backend/src/ocl_stdlib.h	2013-04-22 18:25:49.509225930 +0200
+@@ -438,15 +438,24 @@
+   return a*b+c;
+ }
+ 
++INLINE OVERLOADABLE uint select(uint src0, uint src1, int cond) {
++  return cond ? src1 : src0;
++}
+ INLINE OVERLOADABLE uint select(uint src0, uint src1, uint cond) {
+   return cond ? src1 : src0;
+ }
+ INLINE OVERLOADABLE int select(int src0, int src1, int cond) {
+   return cond ? src1 : src0;
+ }
++INLINE OVERLOADABLE int select(int src0, int src1, uint cond) {
++  return cond ? src1 : src0;
++}
+ INLINE OVERLOADABLE float select(float src0, float src1, int cond) {
+   return cond ? src1 : src0;
+ }
++INLINE OVERLOADABLE float select(float src0, float src1, uint cond) {
++  return cond ? src1 : src0;
++}
+ 
+ // This will be optimized out by LLVM and will output LLVM select instructions
+ #define DECL_SELECT4(TYPE4, TYPE, COND_TYPE4, MASK) \
+@@ -467,7 +476,9 @@
+   return dst; \
+ }
+ DECL_SELECT4(int4, int, int4, 0x80000000)
++DECL_SELECT4(int4, int, uint4, 0x80000000)
+ DECL_SELECT4(float4, float, int4, 0x80000000)
++DECL_SELECT4(float4, float, uint4, 0x80000000)
+ #undef DECL_SELECT4
+ 
+ /////////////////////////////////////////////////////////////////////////////
diff --git a/debian/patches/series b/debian/patches/series
index ddef2bc..dffc483 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@ clang-3.0
 gdi
 driver_version
 const64
+select
+fminmax

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git