[Beignet] [PATCH] Fix signed to unsinged type sat convert.

[Zhigang Gong]

LGTM, pushed, thanks.

On Mon, Dec 02, 2013 at 10:47:43AM +0800, Yang Rong wrote:
> 
> Signed-off-by: Yang Rong <rong.r.yang at intel.com>
> ---
>  backend/src/gen_convert.sh | 21 ++++++++++++---------
>  backend/src/ocl_convert.h  | 21 ++++++++++++---------
>  2 files changed, 24 insertions(+), 18 deletions(-)
> 
> diff --git a/backend/src/gen_convert.sh b/backend/src/gen_convert.sh
> index 30d8876..793ed5b 100755
> --- a/backend/src/gen_convert.sh
> +++ b/backend/src/gen_convert.sh
> @@ -128,9 +128,18 @@ INLINE_OVERLOADABLE long convert_long_sat(ulong x) {
>    return x > MAX ? MAX : x;
>  }
>  
> -INLINE_OVERLOADABLE ulong convert_ulong_sat(long x) {
> -  return x < 0 ? 0 : x;
> -}
> +#define DEF(DSTTYPE, SRCTYPE) \
> +  INLINE_OVERLOADABLE DSTTYPE convert_ ## DSTTYPE ## _sat(SRCTYPE x) { \
> +    return x < 0 ? 0 : x; \
> +  }
> +DEF(ushort, char);
> +DEF(uint, char);
> +DEF(uint, short);
> +DEF(ulong, char);
> +DEF(ulong, short);
> +DEF(ulong, int);
> +DEF(ulong, long);
> +#undef DEF
>  
>  #define DEF(DSTTYPE, SRCTYPE) \
>    INLINE_OVERLOADABLE DSTTYPE convert_ ## DSTTYPE ## _sat(SRCTYPE x) { \
> @@ -141,7 +150,6 @@ DEF(uchar, uchar);
>  DEF(short, char);
>  DEF(short, uchar);
>  DEF(short, short);
> -DEF(ushort, char);
>  DEF(ushort, uchar);
>  DEF(ushort, ushort);
>  DEF(int, char);
> @@ -149,9 +157,7 @@ DEF(int, uchar);
>  DEF(int, short);
>  DEF(int, ushort);
>  DEF(int, int);
> -DEF(uint, char);
>  DEF(uint, uchar);
> -DEF(uint, short);
>  DEF(uint, ushort);
>  DEF(uint, uint);
>  DEF(long, char);
> @@ -161,11 +167,8 @@ DEF(long, ushort);
>  DEF(long, int);
>  DEF(long, uint);
>  DEF(long, long);
> -DEF(ulong, char);
>  DEF(ulong, uchar);
> -DEF(ulong, short);
>  DEF(ulong, ushort);
> -DEF(ulong, int);
>  DEF(ulong, uint);
>  DEF(ulong, ulong);
>  #undef DEF
> diff --git a/backend/src/ocl_convert.h b/backend/src/ocl_convert.h
> index d78d697..e37cecb 100644
> --- a/backend/src/ocl_convert.h
> +++ b/backend/src/ocl_convert.h
> @@ -2310,9 +2310,18 @@ INLINE_OVERLOADABLE long convert_long_sat(ulong x) {
>    return x > MAX ? MAX : x;
>  }
>  
> -INLINE_OVERLOADABLE ulong convert_ulong_sat(long x) {
> -  return x < 0 ? 0 : x;
> -}
> +#define DEF(DSTTYPE, SRCTYPE) \
> +  INLINE_OVERLOADABLE DSTTYPE convert_ ## DSTTYPE ## _sat(SRCTYPE x) { \
> +    return x < 0 ? 0 : x; \
> +  }
> +DEF(ushort, char);
> +DEF(uint, char);
> +DEF(uint, short);
> +DEF(ulong, char);
> +DEF(ulong, short);
> +DEF(ulong, int);
> +DEF(ulong, long);
> +#undef DEF
>  
>  #define DEF(DSTTYPE, SRCTYPE) \
>    INLINE_OVERLOADABLE DSTTYPE convert_ ## DSTTYPE ## _sat(SRCTYPE x) { \
> @@ -2323,7 +2332,6 @@ DEF(uchar, uchar);
>  DEF(short, char);
>  DEF(short, uchar);
>  DEF(short, short);
> -DEF(ushort, char);
>  DEF(ushort, uchar);
>  DEF(ushort, ushort);
>  DEF(int, char);
> @@ -2331,9 +2339,7 @@ DEF(int, uchar);
>  DEF(int, short);
>  DEF(int, ushort);
>  DEF(int, int);
> -DEF(uint, char);
>  DEF(uint, uchar);
> -DEF(uint, short);
>  DEF(uint, ushort);
>  DEF(uint, uint);
>  DEF(long, char);
> @@ -2343,11 +2349,8 @@ DEF(long, ushort);
>  DEF(long, int);
>  DEF(long, uint);
>  DEF(long, long);
> -DEF(ulong, char);
>  DEF(ulong, uchar);
> -DEF(ulong, short);
>  DEF(ulong, ushort);
> -DEF(ulong, int);
>  DEF(ulong, uint);
>  DEF(ulong, ulong);
>  #undef DEF
> -- 
> 1.8.1.2
> 
> _______________________________________________
> Beignet mailing list
> Beignet at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/beignet