Re: [Piglit] [PATCH 1/1] cl: Use required format for sampler test

2017-07-30 Thread Jan Vesely
I plan to push this early next week unless there are objections.

Jan

On Mon, 2017-07-17 at 17:47 -0400, Jan Vesely wrote:
> CL_RGBA + CL_FLOAT is in minimal supported set.
> Fixes sampler test on beignet (IVB).
> 
> Signed-off-by: Jan Vesely 
> ---
>  tests/cl/program/execute/sampler.cl | 18 +-
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/tests/cl/program/execute/sampler.cl 
> b/tests/cl/program/execute/sampler.cl
> index 45960b778..6de1d4462 100644
> --- a/tests/cl/program/execute/sampler.cl
> +++ b/tests/cl/program/execute/sampler.cl
> @@ -10,12 +10,12 @@ local_size:  1 0 0
>  name: read from image using linear filtering and unnormalized coords
>  kernel_name: readf_f_x
>  
> -arg_in:  1 image float   0.0 1.0 \
> - 2.0 3.0 \
> +arg_in:  1 image float4   0.0 0.0 0.0 1.0 1.0 1.0 1.0 1.0   \
> +  2.0 2.0 2.0 1.0 3.0 3.0 3.0 1.0   \
> image_type 2d \
> image_width 2 \
> image_height 2\
> -   image_channel_order INTENSITY \
> +   image_channel_order RGBA \
> image_channel_data_type FLOAT
>  arg_in:  2 sampler normalized_coords 0   \
> addressing_mode NONE  \
> @@ -27,12 +27,12 @@ arg_out: 0 buffer float[4]  0.0  0.5  1.5 
>  1.0
>  name: read from image using linear filtering and normalized coords
>  kernel_name: readf_f_x
>  
> -arg_in:  1 image float   0.0 1.0 \
> - 2.0 3.0 \
> +arg_in:  1 image float4   0.0 0.0 0.0 1.0 1.0 1.0 1.0 1.0   \
> +  2.0 2.0 2.0 1.0 3.0 3.0 3.0 1.0   \
> image_type 2d \
> image_width 2 \
> image_height 2\
> -   image_channel_order INTENSITY \
> +   image_channel_order RGBA \
> image_channel_data_type FLOAT
>  arg_in:  2 sampler normalized_coords 1   \
> addressing_mode NONE  \
> @@ -44,12 +44,12 @@ arg_out: 0 buffer float[4]   0.0   0.5   1.5  
>  1.0
>  name: read from image using clamp_to_edge addressing mode
>  kernel_name: readf_f_x
>  
> -arg_in:  1 image float   0.0 1.0 \
> - 2.0 3.0 \
> +arg_in:  1 image float4   0.0 0.0 0.0 1.0 1.0 1.0 1.0 1.0   \
> +  2.0 2.0 2.0 1.0 3.0 3.0 3.0 1.0   \
> image_type 2d \
> image_width 2 \
> image_height 2\
> -   image_channel_order INTENSITY \
> +   image_channel_order RGBA \
> image_channel_data_type FLOAT
>  arg_in:  2 sampler normalized_coords 0   \
> addressing_mode CLAMP_TO_EDGE  \

-- 
Jan Vesely 

signature.asc
Description: This is a digitally signed message part
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit


Re: [Piglit] [PATCH 1/1] cl: Use required format for sampler test

2017-07-26 Thread Jan Vesely
ping.

Tom, Zoltan,

you added the original test, does this look OK to you?

thanks,
Jan

On Mon, 2017-07-17 at 17:47 -0400, Jan Vesely wrote:
> CL_RGBA + CL_FLOAT is in minimal supported set.
> Fixes sampler test on beignet (IVB and SKL).
> 
> Signed-off-by: Jan Vesely 
> ---
>  tests/cl/program/execute/sampler.cl | 18 +-
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/tests/cl/program/execute/sampler.cl 
> b/tests/cl/program/execute/sampler.cl
> index 45960b778..6de1d4462 100644
> --- a/tests/cl/program/execute/sampler.cl
> +++ b/tests/cl/program/execute/sampler.cl
> @@ -10,12 +10,12 @@ local_size:  1 0 0
>  name: read from image using linear filtering and unnormalized coords
>  kernel_name: readf_f_x
>  
> -arg_in:  1 image float   0.0 1.0 \
> - 2.0 3.0 \
> +arg_in:  1 image float4   0.0 0.0 0.0 1.0 1.0 1.0 1.0 1.0   \
> +  2.0 2.0 2.0 1.0 3.0 3.0 3.0 1.0   \
> image_type 2d \
> image_width 2 \
> image_height 2\
> -   image_channel_order INTENSITY \
> +   image_channel_order RGBA \
> image_channel_data_type FLOAT
>  arg_in:  2 sampler normalized_coords 0   \
> addressing_mode NONE  \
> @@ -27,12 +27,12 @@ arg_out: 0 buffer float[4]  0.0  0.5  1.5 
>  1.0
>  name: read from image using linear filtering and normalized coords
>  kernel_name: readf_f_x
>  
> -arg_in:  1 image float   0.0 1.0 \
> - 2.0 3.0 \
> +arg_in:  1 image float4   0.0 0.0 0.0 1.0 1.0 1.0 1.0 1.0   \
> +  2.0 2.0 2.0 1.0 3.0 3.0 3.0 1.0   \
> image_type 2d \
> image_width 2 \
> image_height 2\
> -   image_channel_order INTENSITY \
> +   image_channel_order RGBA \
> image_channel_data_type FLOAT
>  arg_in:  2 sampler normalized_coords 1   \
> addressing_mode NONE  \
> @@ -44,12 +44,12 @@ arg_out: 0 buffer float[4]   0.0   0.5   1.5  
>  1.0
>  name: read from image using clamp_to_edge addressing mode
>  kernel_name: readf_f_x
>  
> -arg_in:  1 image float   0.0 1.0 \
> - 2.0 3.0 \
> +arg_in:  1 image float4   0.0 0.0 0.0 1.0 1.0 1.0 1.0 1.0   \
> +  2.0 2.0 2.0 1.0 3.0 3.0 3.0 1.0   \
> image_type 2d \
> image_width 2 \
> image_height 2\
> -   image_channel_order INTENSITY \
> +   image_channel_order RGBA \
> image_channel_data_type FLOAT
>  arg_in:  2 sampler normalized_coords 0   \
> addressing_mode CLAMP_TO_EDGE  \


signature.asc
Description: This is a digitally signed message part
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit


[Piglit] [PATCH 1/1] cl: Use required format for sampler test

2017-07-17 Thread Jan Vesely
CL_RGBA + CL_FLOAT is in minimal supported set.
Fixes sampler test on beignet (IVB).

Signed-off-by: Jan Vesely 
---
 tests/cl/program/execute/sampler.cl | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/cl/program/execute/sampler.cl 
b/tests/cl/program/execute/sampler.cl
index 45960b778..6de1d4462 100644
--- a/tests/cl/program/execute/sampler.cl
+++ b/tests/cl/program/execute/sampler.cl
@@ -10,12 +10,12 @@ local_size:  1 0 0
 name: read from image using linear filtering and unnormalized coords
 kernel_name: readf_f_x
 
-arg_in:  1 image float   0.0 1.0 \
- 2.0 3.0 \
+arg_in:  1 image float4   0.0 0.0 0.0 1.0 1.0 1.0 1.0 1.0   \
+  2.0 2.0 2.0 1.0 3.0 3.0 3.0 1.0   \
image_type 2d \
image_width 2 \
image_height 2\
-   image_channel_order INTENSITY \
+   image_channel_order RGBA \
image_channel_data_type FLOAT
 arg_in:  2 sampler normalized_coords 0   \
addressing_mode NONE  \
@@ -27,12 +27,12 @@ arg_out: 0 buffer float[4]  0.0  0.5  1.5  
1.0
 name: read from image using linear filtering and normalized coords
 kernel_name: readf_f_x
 
-arg_in:  1 image float   0.0 1.0 \
- 2.0 3.0 \
+arg_in:  1 image float4   0.0 0.0 0.0 1.0 1.0 1.0 1.0 1.0   \
+  2.0 2.0 2.0 1.0 3.0 3.0 3.0 1.0   \
image_type 2d \
image_width 2 \
image_height 2\
-   image_channel_order INTENSITY \
+   image_channel_order RGBA \
image_channel_data_type FLOAT
 arg_in:  2 sampler normalized_coords 1   \
addressing_mode NONE  \
@@ -44,12 +44,12 @@ arg_out: 0 buffer float[4]   0.0   0.5   1.5
   1.0
 name: read from image using clamp_to_edge addressing mode
 kernel_name: readf_f_x
 
-arg_in:  1 image float   0.0 1.0 \
- 2.0 3.0 \
+arg_in:  1 image float4   0.0 0.0 0.0 1.0 1.0 1.0 1.0 1.0   \
+  2.0 2.0 2.0 1.0 3.0 3.0 3.0 1.0   \
image_type 2d \
image_width 2 \
image_height 2\
-   image_channel_order INTENSITY \
+   image_channel_order RGBA \
image_channel_data_type FLOAT
 arg_in:  2 sampler normalized_coords 0   \
addressing_mode CLAMP_TO_EDGE  \
-- 
2.13.3

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit