[v2] EGL_EXT_image_dma_buf_import: add AYUV format support

Submitted by Lionel Landwerlin on Nov. 9, 2018, 5:27 p.m.

Details

Message ID 20181109172715.15200-1-lionel.g.landwerlin@intel.com
State New
Headers show
Series "EGL_EXT_image_dma_buf_import: add AYUV format support" ( rev: 2 ) in Piglit

Not browsing as part of any series.

Commit Message

Lionel Landwerlin Nov. 9, 2018, 5:27 p.m.
v2: Forgot to add the new test to opengl.py
    Drop some code to deal with alpha channel

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 tests/opengl.py                               |  2 ++
 .../ext_image_dma_buf_import/sample_yuv.c     | 26 ++++++++++++++++++-
 .../piglit-framework-gl/piglit_drm_dma_buf.c  |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/tests/opengl.py b/tests/opengl.py
index b74606be1..e01f3e6e7 100644
--- a/tests/opengl.py
+++ b/tests/opengl.py
@@ -3029,6 +3029,8 @@  with profile.test_list.group_manager(
       'ext_image_dma_buf_import-sample_yuv420', run_concurrent=False)
     g(['ext_image_dma_buf_import-sample_yuv', '-fmt=YV12', '-alpha-one'],
       'ext_image_dma_buf_import-sample_yvu420', run_concurrent=False)
+    g(['ext_image_dma_buf_import-sample_yuv', '-fmt=AYUV'],
+      'ext_image_dma_buf_import-sample_ayuv', run_concurrent=False)
     g(['ext_image_dma_buf_import-transcode-nv12-as-r8-gr88'],
       'ext_image_dma_buf_import-transcode-nv12-as-r8-gr88',
       run_concurrent=False)
diff --git a/tests/spec/ext_image_dma_buf_import/sample_yuv.c b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
index a314bc56f..bb9997102 100644
--- a/tests/spec/ext_image_dma_buf_import/sample_yuv.c
+++ b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
@@ -77,9 +77,30 @@  piglit_display(void)
 		/* U */
 		120, 140,
 		120, 140,
+	}, ayuv[] = {
+		/* AYUV (TODO: find a way to test alpha channel) */
+		130, 120,  50, 255,
+		130, 127,  70, 255,
+		130, 133,  90, 255,
+		130, 140, 110, 255,
+
+		140, 120,  50, 255,
+		140, 127,  70, 255,
+		140, 133,  90, 255,
+		140, 140, 110, 255,
+
+		150, 120,  50, 255,
+		150, 127,  70, 255,
+		150, 133,  90, 255,
+		150, 140, 110, 255,
+
+		160, 120,  50, 255,
+		160, 127,  70, 255,
+		160, 133,  90, 255,
+		160, 140, 110, 255,
 	};
 
-	static const unsigned char expected[4 * 4 * 4] = {
+	unsigned char expected[4 * 4 * 4] = {
 		 44,  41,  25, 255,
 		 67,  64,  48, 255,
 		 90,  79, 111, 255,
@@ -114,6 +135,9 @@  piglit_display(void)
 	case DRM_FORMAT_YVU420:
 		t = yvu420;
 		break;
+	case DRM_FORMAT_AYUV:
+		t = ayuv;
+		break;
 	default:
 		return PIGLIT_SKIP;
 	}
diff --git a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
index 869d9db7d..13bf883f2 100644
--- a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
+++ b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
@@ -154,6 +154,7 @@  piglit_intel_buf_create(unsigned w, unsigned h, unsigned fourcc,
 	case DRM_FORMAT_ABGR8888:
 	case DRM_FORMAT_RGBA8888:
 	case DRM_FORMAT_BGRA8888:
+	case DRM_FORMAT_AYUV:
 		cpp = 4;
 		break;
 	case DRM_FORMAT_NV12:

Comments

On Friday, 2018-11-09 17:27:15 +0000, Lionel Landwerlin wrote:
> v2: Forgot to add the new test to opengl.py
>     Drop some code to deal with alpha channel
> 
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> ---
>  tests/opengl.py                               |  2 ++
>  .../ext_image_dma_buf_import/sample_yuv.c     | 26 ++++++++++++++++++-
>  .../piglit-framework-gl/piglit_drm_dma_buf.c  |  1 +
>  3 files changed, 28 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/opengl.py b/tests/opengl.py
> index b74606be1..e01f3e6e7 100644
> --- a/tests/opengl.py
> +++ b/tests/opengl.py
> @@ -3029,6 +3029,8 @@ with profile.test_list.group_manager(
>        'ext_image_dma_buf_import-sample_yuv420', run_concurrent=False)
>      g(['ext_image_dma_buf_import-sample_yuv', '-fmt=YV12', '-alpha-one'],
>        'ext_image_dma_buf_import-sample_yvu420', run_concurrent=False)
> +    g(['ext_image_dma_buf_import-sample_yuv', '-fmt=AYUV'],
> +      'ext_image_dma_buf_import-sample_ayuv', run_concurrent=False)
>      g(['ext_image_dma_buf_import-transcode-nv12-as-r8-gr88'],
>        'ext_image_dma_buf_import-transcode-nv12-as-r8-gr88',
>        run_concurrent=False)
> diff --git a/tests/spec/ext_image_dma_buf_import/sample_yuv.c b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
> index a314bc56f..bb9997102 100644
> --- a/tests/spec/ext_image_dma_buf_import/sample_yuv.c
> +++ b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
> @@ -77,9 +77,30 @@ piglit_display(void)
>  		/* U */
>  		120, 140,
>  		120, 140,
> +	}, ayuv[] = {
> +		/* AYUV (TODO: find a way to test alpha channel) */
> +		130, 120,  50, 255,
> +		130, 127,  70, 255,
> +		130, 133,  90, 255,
> +		130, 140, 110, 255,
> +
> +		140, 120,  50, 255,
> +		140, 127,  70, 255,
> +		140, 133,  90, 255,
> +		140, 140, 110, 255,
> +
> +		150, 120,  50, 255,
> +		150, 127,  70, 255,
> +		150, 133,  90, 255,
> +		150, 140, 110, 255,
> +
> +		160, 120,  50, 255,
> +		160, 127,  70, 255,
> +		160, 133,  90, 255,
> +		160, 140, 110, 255,
>  	};
>  
> -	static const unsigned char expected[4 * 4 * 4] = {
> +	unsigned char expected[4 * 4 * 4] = {

I assume that wasn't meant to be committed?

>  		 44,  41,  25, 255,
>  		 67,  64,  48, 255,
>  		 90,  79, 111, 255,
> @@ -114,6 +135,9 @@ piglit_display(void)
>  	case DRM_FORMAT_YVU420:
>  		t = yvu420;
>  		break;
> +	case DRM_FORMAT_AYUV:
> +		t = ayuv;
> +		break;
>  	default:
>  		return PIGLIT_SKIP;
>  	}
> diff --git a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
> index 869d9db7d..13bf883f2 100644
> --- a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
> +++ b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
> @@ -154,6 +154,7 @@ piglit_intel_buf_create(unsigned w, unsigned h, unsigned fourcc,
>  	case DRM_FORMAT_ABGR8888:
>  	case DRM_FORMAT_RGBA8888:
>  	case DRM_FORMAT_BGRA8888:
> +	case DRM_FORMAT_AYUV:
>  		cpp = 4;
>  		break;
>  	case DRM_FORMAT_NV12:
> -- 
> 2.19.1
> 
> _______________________________________________
> Piglit mailing list
> Piglit@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit
On 09/11/2018 17:31, Eric Engestrom wrote:
> On Friday, 2018-11-09 17:27:15 +0000, Lionel Landwerlin wrote:
>> v2: Forgot to add the new test to opengl.py
>>      Drop some code to deal with alpha channel
>>
>> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>> ---
>>   tests/opengl.py                               |  2 ++
>>   .../ext_image_dma_buf_import/sample_yuv.c     | 26 ++++++++++++++++++-
>>   .../piglit-framework-gl/piglit_drm_dma_buf.c  |  1 +
>>   3 files changed, 28 insertions(+), 1 deletion(-)
>>
>> diff --git a/tests/opengl.py b/tests/opengl.py
>> index b74606be1..e01f3e6e7 100644
>> --- a/tests/opengl.py
>> +++ b/tests/opengl.py
>> @@ -3029,6 +3029,8 @@ with profile.test_list.group_manager(
>>         'ext_image_dma_buf_import-sample_yuv420', run_concurrent=False)
>>       g(['ext_image_dma_buf_import-sample_yuv', '-fmt=YV12', '-alpha-one'],
>>         'ext_image_dma_buf_import-sample_yvu420', run_concurrent=False)
>> +    g(['ext_image_dma_buf_import-sample_yuv', '-fmt=AYUV'],
>> +      'ext_image_dma_buf_import-sample_ayuv', run_concurrent=False)
>>       g(['ext_image_dma_buf_import-transcode-nv12-as-r8-gr88'],
>>         'ext_image_dma_buf_import-transcode-nv12-as-r8-gr88',
>>         run_concurrent=False)
>> diff --git a/tests/spec/ext_image_dma_buf_import/sample_yuv.c b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
>> index a314bc56f..bb9997102 100644
>> --- a/tests/spec/ext_image_dma_buf_import/sample_yuv.c
>> +++ b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
>> @@ -77,9 +77,30 @@ piglit_display(void)
>>   		/* U */
>>   		120, 140,
>>   		120, 140,
>> +	}, ayuv[] = {
>> +		/* AYUV (TODO: find a way to test alpha channel) */
>> +		130, 120,  50, 255,
>> +		130, 127,  70, 255,
>> +		130, 133,  90, 255,
>> +		130, 140, 110, 255,
>> +
>> +		140, 120,  50, 255,
>> +		140, 127,  70, 255,
>> +		140, 133,  90, 255,
>> +		140, 140, 110, 255,
>> +
>> +		150, 120,  50, 255,
>> +		150, 127,  70, 255,
>> +		150, 133,  90, 255,
>> +		150, 140, 110, 255,
>> +
>> +		160, 120,  50, 255,
>> +		160, 127,  70, 255,
>> +		160, 133,  90, 255,
>> +		160, 140, 110, 255,
>>   	};
>>   
>> -	static const unsigned char expected[4 * 4 * 4] = {
>> +	unsigned char expected[4 * 4 * 4] = {
> I assume that wasn't meant to be committed?


Indeed. Does the rest of the patch look okay?


>
>>   		 44,  41,  25, 255,
>>   		 67,  64,  48, 255,
>>   		 90,  79, 111, 255,
>> @@ -114,6 +135,9 @@ piglit_display(void)
>>   	case DRM_FORMAT_YVU420:
>>   		t = yvu420;
>>   		break;
>> +	case DRM_FORMAT_AYUV:
>> +		t = ayuv;
>> +		break;
>>   	default:
>>   		return PIGLIT_SKIP;
>>   	}
>> diff --git a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
>> index 869d9db7d..13bf883f2 100644
>> --- a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
>> +++ b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
>> @@ -154,6 +154,7 @@ piglit_intel_buf_create(unsigned w, unsigned h, unsigned fourcc,
>>   	case DRM_FORMAT_ABGR8888:
>>   	case DRM_FORMAT_RGBA8888:
>>   	case DRM_FORMAT_BGRA8888:
>> +	case DRM_FORMAT_AYUV:
>>   		cpp = 4;
>>   		break;
>>   	case DRM_FORMAT_NV12:
>> -- 
>> 2.19.1
>>
>> _______________________________________________
>> Piglit mailing list
>> Piglit@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/piglit
It would be indeed nice to test the alpha channel too, especially if we 
enable XYUV too but it can be added later ... with Eric's comment addressed;

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>

On 11/9/18 7:27 PM, Lionel Landwerlin wrote:
> v2: Forgot to add the new test to opengl.py
>      Drop some code to deal with alpha channel
> 
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> ---
>   tests/opengl.py                               |  2 ++
>   .../ext_image_dma_buf_import/sample_yuv.c     | 26 ++++++++++++++++++-
>   .../piglit-framework-gl/piglit_drm_dma_buf.c  |  1 +
>   3 files changed, 28 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/opengl.py b/tests/opengl.py
> index b74606be1..e01f3e6e7 100644
> --- a/tests/opengl.py
> +++ b/tests/opengl.py
> @@ -3029,6 +3029,8 @@ with profile.test_list.group_manager(
>         'ext_image_dma_buf_import-sample_yuv420', run_concurrent=False)
>       g(['ext_image_dma_buf_import-sample_yuv', '-fmt=YV12', '-alpha-one'],
>         'ext_image_dma_buf_import-sample_yvu420', run_concurrent=False)
> +    g(['ext_image_dma_buf_import-sample_yuv', '-fmt=AYUV'],
> +      'ext_image_dma_buf_import-sample_ayuv', run_concurrent=False)
>       g(['ext_image_dma_buf_import-transcode-nv12-as-r8-gr88'],
>         'ext_image_dma_buf_import-transcode-nv12-as-r8-gr88',
>         run_concurrent=False)
> diff --git a/tests/spec/ext_image_dma_buf_import/sample_yuv.c b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
> index a314bc56f..bb9997102 100644
> --- a/tests/spec/ext_image_dma_buf_import/sample_yuv.c
> +++ b/tests/spec/ext_image_dma_buf_import/sample_yuv.c
> @@ -77,9 +77,30 @@ piglit_display(void)
>   		/* U */
>   		120, 140,
>   		120, 140,
> +	}, ayuv[] = {
> +		/* AYUV (TODO: find a way to test alpha channel) */
> +		130, 120,  50, 255,
> +		130, 127,  70, 255,
> +		130, 133,  90, 255,
> +		130, 140, 110, 255,
> +
> +		140, 120,  50, 255,
> +		140, 127,  70, 255,
> +		140, 133,  90, 255,
> +		140, 140, 110, 255,
> +
> +		150, 120,  50, 255,
> +		150, 127,  70, 255,
> +		150, 133,  90, 255,
> +		150, 140, 110, 255,
> +
> +		160, 120,  50, 255,
> +		160, 127,  70, 255,
> +		160, 133,  90, 255,
> +		160, 140, 110, 255,
>   	};
>   
> -	static const unsigned char expected[4 * 4 * 4] = {
> +	unsigned char expected[4 * 4 * 4] = {
>   		 44,  41,  25, 255,
>   		 67,  64,  48, 255,
>   		 90,  79, 111, 255,
> @@ -114,6 +135,9 @@ piglit_display(void)
>   	case DRM_FORMAT_YVU420:
>   		t = yvu420;
>   		break;
> +	case DRM_FORMAT_AYUV:
> +		t = ayuv;
> +		break;
>   	default:
>   		return PIGLIT_SKIP;
>   	}
> diff --git a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
> index 869d9db7d..13bf883f2 100644
> --- a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
> +++ b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
> @@ -154,6 +154,7 @@ piglit_intel_buf_create(unsigned w, unsigned h, unsigned fourcc,
>   	case DRM_FORMAT_ABGR8888:
>   	case DRM_FORMAT_RGBA8888:
>   	case DRM_FORMAT_BGRA8888:
> +	case DRM_FORMAT_AYUV:
>   		cpp = 4;
>   		break;
>   	case DRM_FORMAT_NV12:
>