Re: [Piglit] [PATCH v3] arb_blend_func_extended: Test dual src blending without second color output

2018-11-09 Thread Ilia Mirkin 
Sorry, I don't have time to review now, and may not for a bit. No
reason that I have to though...
On Fri, Nov 9, 2018 at 12:22 PM Dylan Baker  wrote:
>
> I'm okay with merging this version, Ilia?
>
> Quoting Danylo Piliaiev (2018-11-09 05:27:05)
> > Hi,
> >
> > Since the fix for the underlying issue was pushed to Mesa in
> > eca4a6548d0702a7768edb397bad7b72cfc2
> > could this test be also pushed?
> >
> > - Danil
> >
> > On 7/9/18 11:54 AM, Danylo Piliaiev wrote:
> > > Using fragment shader without second color output should not hang gpu
> > > when dual source blending is enabled.
> > > It hanged Intel gen8+ GPUs when discarding fragments and depth test
> > > being enabled.
> > > There is also safeguard against lack of second color output in radeonsi.
> > >
> > > v2: by Ilia Mirkin
> > >  - Set supports_gl_compat_version = 30
> > >  - Moved drawing to piglit_display
> > >  - Change drawing sequence to: clear red -> draw -> clear green
> > >
> > > v3: by Dylan Baker
> > >  - Removed run_concurrent=False
> > >
> > > Signed-off-by: Danylo Piliaiev 
> > > ---
> > >   tests/opengl.py   |   2 +
> > >   .../execution/CMakeLists.gl.txt   |   1 +
> > >   .../execution/CMakeLists.gles3.txt|   1 +
> > >   .../dual-src-blending-discard-without-src1.c  | 126 ++
> > >   4 files changed, 130 insertions(+)
> > >   create mode 100644 
> > > tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
> > >
> > > diff --git a/tests/opengl.py b/tests/opengl.py
> > > index 02110ff86..1b088b75f 100644
> > > --- a/tests/opengl.py
> > > +++ b/tests/opengl.py
> > > @@ -4114,6 +4114,7 @@ with profile.test_list.group_manager(
> > >   g(['arb_blend_func_extended-fbo-extended-blend'])
> > >   g(['arb_blend_func_extended-fbo-extended-blend-explicit'])
> > >   g(['arb_blend_func_extended-fbo-extended-blend-pattern'])
> > > +g(['arb_blend_func_extended-dual-src-blending-discard-without-src1'])
> > >   g(['arb_blend_func_extended-blend-api_gles2'])
> > >   g(['arb_blend_func_extended-builtins_gles2'])
> > >   
> > > g(['arb_blend_func_extended-bindfragdataindexed-invalid-parameters_gles3'])
> > > @@ -4123,6 +4124,7 @@ with profile.test_list.group_manager(
> > >   g(['arb_blend_func_extended-fbo-extended-blend-pattern_gles3'])
> > >   g(['arb_blend_func_extended-fbo-extended-blend_gles3'])
> > >   g(['arb_blend_func_extended-fbo-extended-blend-explicit_gles3'])
> > > +
> > > g(['arb_blend_func_extended-dual-src-blending-discard-without-src1_gles3'])
> > >
> > >   with profile.test_list.group_manager(
> > >   PiglitGLTest,
> > > diff --git 
> > > a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt 
> > > b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
> > > index f48c352e1..09d45b72c 100644
> > > --- a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
> > > +++ b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
> > > @@ -12,4 +12,5 @@ link_libraries (
> > >   piglit_add_executable (arb_blend_func_extended-fbo-extended-blend 
> > > fbo-extended-blend.c)
> > >   piglit_add_executable 
> > > (arb_blend_func_extended-fbo-extended-blend-explicit 
> > > fbo-extended-blend-explicit.c)
> > >   piglit_add_executable 
> > > (arb_blend_func_extended-fbo-extended-blend-pattern 
> > > fbo-extended-blend-pattern.c)
> > > +piglit_add_executable 
> > > (arb_blend_func_extended-dual-src-blending-discard-without-src1 
> > > dual-src-blending-discard-without-src1.c)
> > >   # vim: ft=cmake:
> > > diff --git 
> > > a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt 
> > > b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt
> > > index a70e9fa5e..fd41622bd 100644
> > > --- a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt
> > > +++ b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt
> > > @@ -3,4 +3,5 @@ link_libraries(piglitutil_${piglit_target_api})
> > >   piglit_add_executable 
> > > (arb_blend_func_extended-fbo-extended-blend_${piglit_target_api} 
> > > fbo-extended-blend.c)
> > >   piglit_add_executable 
> > > (arb_blend_func_extended-fbo-extended-blend-explicit_${piglit_target_api} 
> > > fbo-extended-blend-explicit.c)
> > >   piglit_add_executable 
> > > (arb_blend_func_extended-fbo-extended-blend-pattern_${piglit_target_api} 
> > > fbo-extended-blend-pattern.c)
> > > +piglit_add_executable 
> > > (arb_blend_func_extended-dual-src-blending-discard-without-src1_${piglit_target_api}
> > >  dual-src-blending-discard-without-src1.c)
> > >   # vim: ft=cmake:
> > > diff --git 
> > > a/tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
> > >  
> > > b/tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
> > > new file mode 100644
> > > index 0..a0a45cd79
> > > --- /dev/null
> > > +++ 
> > >

Re: [Piglit] [PATCH v2] EGL_EXT_image_dma_buf_import: add AYUV format support

2018-11-09 Thread Eric Engestrom 
On Friday, 2018-11-09 17:27:15 +, 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 
> ---
>  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_ABGR:
>   case DRM_FORMAT_RGBA:
>   case DRM_FORMAT_BGRA:
> + 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
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH v2] EGL_EXT_image_dma_buf_import: add AYUV format support

2018-11-09 Thread Lionel Landwerlin 
v2: Forgot to add the new test to opengl.py
Drop some code to deal with alpha channel

Signed-off-by: Lionel Landwerlin 
---
 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_ABGR:
case DRM_FORMAT_RGBA:
case DRM_FORMAT_BGRA:
+   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

Re: [Piglit] [PATCH v3] arb_blend_func_extended: Test dual src blending without second color output

2018-11-09 Thread Dylan Baker 
I'm okay with merging this version, Ilia?

Quoting Danylo Piliaiev (2018-11-09 05:27:05)
> Hi,
> 
> Since the fix for the underlying issue was pushed to Mesa in 
> eca4a6548d0702a7768edb397bad7b72cfc2
> could this test be also pushed?
> 
> - Danil
> 
> On 7/9/18 11:54 AM, Danylo Piliaiev wrote:
> > Using fragment shader without second color output should not hang gpu
> > when dual source blending is enabled.
> > It hanged Intel gen8+ GPUs when discarding fragments and depth test
> > being enabled.
> > There is also safeguard against lack of second color output in radeonsi.
> >
> > v2: by Ilia Mirkin
> >  - Set supports_gl_compat_version = 30
> >  - Moved drawing to piglit_display
> >  - Change drawing sequence to: clear red -> draw -> clear green
> >
> > v3: by Dylan Baker
> >  - Removed run_concurrent=False
> >
> > Signed-off-by: Danylo Piliaiev 
> > ---
> >   tests/opengl.py   |   2 +
> >   .../execution/CMakeLists.gl.txt   |   1 +
> >   .../execution/CMakeLists.gles3.txt|   1 +
> >   .../dual-src-blending-discard-without-src1.c  | 126 ++
> >   4 files changed, 130 insertions(+)
> >   create mode 100644 
> > tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
> >
> > diff --git a/tests/opengl.py b/tests/opengl.py
> > index 02110ff86..1b088b75f 100644
> > --- a/tests/opengl.py
> > +++ b/tests/opengl.py
> > @@ -4114,6 +4114,7 @@ with profile.test_list.group_manager(
> >   g(['arb_blend_func_extended-fbo-extended-blend'])
> >   g(['arb_blend_func_extended-fbo-extended-blend-explicit'])
> >   g(['arb_blend_func_extended-fbo-extended-blend-pattern'])
> > +g(['arb_blend_func_extended-dual-src-blending-discard-without-src1'])
> >   g(['arb_blend_func_extended-blend-api_gles2'])
> >   g(['arb_blend_func_extended-builtins_gles2'])
> >   
> > g(['arb_blend_func_extended-bindfragdataindexed-invalid-parameters_gles3'])
> > @@ -4123,6 +4124,7 @@ with profile.test_list.group_manager(
> >   g(['arb_blend_func_extended-fbo-extended-blend-pattern_gles3'])
> >   g(['arb_blend_func_extended-fbo-extended-blend_gles3'])
> >   g(['arb_blend_func_extended-fbo-extended-blend-explicit_gles3'])
> > +
> > g(['arb_blend_func_extended-dual-src-blending-discard-without-src1_gles3'])
> >   
> >   with profile.test_list.group_manager(
> >   PiglitGLTest,
> > diff --git a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt 
> > b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
> > index f48c352e1..09d45b72c 100644
> > --- a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
> > +++ b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
> > @@ -12,4 +12,5 @@ link_libraries (
> >   piglit_add_executable (arb_blend_func_extended-fbo-extended-blend 
> > fbo-extended-blend.c)
> >   piglit_add_executable 
> > (arb_blend_func_extended-fbo-extended-blend-explicit 
> > fbo-extended-blend-explicit.c)
> >   piglit_add_executable (arb_blend_func_extended-fbo-extended-blend-pattern 
> > fbo-extended-blend-pattern.c)
> > +piglit_add_executable 
> > (arb_blend_func_extended-dual-src-blending-discard-without-src1 
> > dual-src-blending-discard-without-src1.c)
> >   # vim: ft=cmake:
> > diff --git 
> > a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt 
> > b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt
> > index a70e9fa5e..fd41622bd 100644
> > --- a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt
> > +++ b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt
> > @@ -3,4 +3,5 @@ link_libraries(piglitutil_${piglit_target_api})
> >   piglit_add_executable 
> > (arb_blend_func_extended-fbo-extended-blend_${piglit_target_api} 
> > fbo-extended-blend.c)
> >   piglit_add_executable 
> > (arb_blend_func_extended-fbo-extended-blend-explicit_${piglit_target_api} 
> > fbo-extended-blend-explicit.c)
> >   piglit_add_executable 
> > (arb_blend_func_extended-fbo-extended-blend-pattern_${piglit_target_api} 
> > fbo-extended-blend-pattern.c)
> > +piglit_add_executable 
> > (arb_blend_func_extended-dual-src-blending-discard-without-src1_${piglit_target_api}
> >  dual-src-blending-discard-without-src1.c)
> >   # vim: ft=cmake:
> > diff --git 
> > a/tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
> >  
> > b/tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
> > new file mode 100644
> > index 0..a0a45cd79
> > --- /dev/null
> > +++ 
> > b/tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
> > @@ -0,0 +1,126 @@
> > +/* Copyright © 2018 Danylo Piliaiev
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining a
> > + * copy of this software and associated documentation files (the 
> > "Software"),
> > + * to deal in the Software without

Re: [Piglit] [PATCH] remove ext_image_dma_buf_import-intel_external_sampler_with_dma_only

2018-11-09 Thread Jason Ekstrand 
On Fri, Nov 9, 2018 at 11:18 AM Lionel Landwerlin <
lionel.g.landwer...@intel.com> wrote:

> Commit a5c39ed974402c ("i965: Lift restriction in external textures
> for EGLImage support") from Mesa lifted the restriction that this test
> was checking. Easy fix!
>
> Signed-off-by: Lionel Landwerlin 
> ---
>  tests/opengl.py   |   2 -
>  .../CMakeLists.gles2.txt  |   1 -
>  .../intel_external_sampler_with_dma_only.c| 104 --
>  3 files changed, 107 deletions(-)
>  delete mode 100644
> tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c
>
> diff --git a/tests/opengl.py b/tests/opengl.py
> index b74606be1..83cc18fe0 100644
> --- a/tests/opengl.py
> +++ b/tests/opengl.py
> @@ -3016,8 +3016,6 @@ with profile.test_list.group_manager(
>run_concurrent=False)
>  g(['ext_image_dma_buf_import-intel_external_sampler_only'],
>run_concurrent=False)
> -g(['ext_image_dma_buf_import-intel_external_sampler_with_dma_only'],
> -  run_concurrent=False)
>  g(['ext_image_dma_buf_import-refcount'])
>  g(['ext_image_dma_buf_import-sample_rgb', '-fmt=AR24'],
>'ext_image_dma_buf_import-sample_argb', run_concurrent=False)
> diff --git a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> index 93f43fad9..f99a5d800 100644
> --- a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> +++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> @@ -19,7 +19,6 @@ if(PIGLIT_BUILD_DMA_BUF_TESTS)
> piglit_add_executable(ext_image_dma_buf_import-refcount refcount.c
> sample_common.c image_common.c)
> piglit_add_executable(ext_image_dma_buf_import-sample_yuv
> sample_yuv.c sample_common.c image_common.c)
> piglit_add_executable(ext_image_dma_buf_import-sample_rgb
> sample_rgb.c sample_common.c image_common.c)
> -
>  
> piglit_add_executable(ext_image_dma_buf_import-intel_external_sampler_with_dma_only
> intel_external_sampler_with_dma_only.c image_common.c)
>
> piglit_add_executable(ext_image_dma_buf_import-transcode-nv12-as-r8-gr88
> transcode-nv12-as-r8-gr88.c image_common.c)
>  endif()
>
> diff --git
> a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c
> b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c
> deleted file mode 100644
> index 6b5c7a1e7..0
> ---
> a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c
> +++ /dev/null
> @@ -1,104 +0,0 @@
> -/*
> - * Copyright © 2013 Intel Corporation
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the
> "Software"),
> - * to deal in the Software without restriction, including without
> limitation
> - * the rights to use, copy, modify, merge, publish, distribute,
> sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the
> next
> - * paragraph) shall be included in all copies or substantial portions of
> the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
> SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> - * IN THE SOFTWARE.
> - */
> -
> -#include "image_common.h"
> -
> -/**
> - * @file intel_external_sampler_with_dma_only.c
> - *
> - * Intel driver allows image external sampler to be used only with
> imported
> - * dma buffers. This test creates an egl image based on a 2D-texture,
> attempts
> - * to use the image as target for an external texture, and expects to
> fail with
> - * GL_INVALID_OPERATION.
> - */
> -
> -PIGLIT_GL_TEST_CONFIG_BEGIN
> -
> -   config.supports_gl_es_version = 10;
> -
> -PIGLIT_GL_TEST_CONFIG_END
> -
> -static EGLImageKHR
> -create_tex_based_egl_image(unsigned w, unsigned h, const unsigned char
> *pixels)
> -{
> -   GLuint tex;
> -   EGLImageKHR img;
> -
> -   glGenTextures(1, );
> -   glBindTexture(GL_TEXTURE_2D, tex);
> -
> -   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
> -  GL_UNSIGNED_BYTE, pixels);
> -
> -   img = eglCreateImageKHR(eglGetCurrentDisplay(),
> eglGetCurrentContext(),
> -  EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)(intptr_t)tex, 0);
> -   if (!img)
> -  printf("failed to create EGL image out of texture\n");
> -
> -   glDeleteTextures(1, );
> -
> -   return img;
>

[Piglit] [PATCH] remove ext_image_dma_buf_import-intel_external_sampler_with_dma_only

2018-11-09 Thread Lionel Landwerlin 
Commit a5c39ed974402c ("i965: Lift restriction in external textures
for EGLImage support") from Mesa lifted the restriction that this test
was checking. Easy fix!

Signed-off-by: Lionel Landwerlin 
---
 tests/opengl.py   |   2 -
 .../CMakeLists.gles2.txt  |   1 -
 .../intel_external_sampler_with_dma_only.c| 104 --
 3 files changed, 107 deletions(-)
 delete mode 100644 
tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c

diff --git a/tests/opengl.py b/tests/opengl.py
index b74606be1..83cc18fe0 100644
--- a/tests/opengl.py
+++ b/tests/opengl.py
@@ -3016,8 +3016,6 @@ with profile.test_list.group_manager(
   run_concurrent=False)
 g(['ext_image_dma_buf_import-intel_external_sampler_only'],
   run_concurrent=False)
-g(['ext_image_dma_buf_import-intel_external_sampler_with_dma_only'],
-  run_concurrent=False)
 g(['ext_image_dma_buf_import-refcount'])
 g(['ext_image_dma_buf_import-sample_rgb', '-fmt=AR24'],
   'ext_image_dma_buf_import-sample_argb', run_concurrent=False)
diff --git a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt 
b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
index 93f43fad9..f99a5d800 100644
--- a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
+++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
@@ -19,7 +19,6 @@ if(PIGLIT_BUILD_DMA_BUF_TESTS)
piglit_add_executable(ext_image_dma_buf_import-refcount refcount.c 
sample_common.c image_common.c)
piglit_add_executable(ext_image_dma_buf_import-sample_yuv sample_yuv.c 
sample_common.c image_common.c)
piglit_add_executable(ext_image_dma_buf_import-sample_rgb sample_rgb.c 
sample_common.c image_common.c)
-   
piglit_add_executable(ext_image_dma_buf_import-intel_external_sampler_with_dma_only
 intel_external_sampler_with_dma_only.c image_common.c)

piglit_add_executable(ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 
transcode-nv12-as-r8-gr88.c image_common.c)
 endif()
 
diff --git 
a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c 
b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c
deleted file mode 100644
index 6b5c7a1e7..0
--- a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright © 2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "image_common.h"
-
-/**
- * @file intel_external_sampler_with_dma_only.c
- *
- * Intel driver allows image external sampler to be used only with imported 
- * dma buffers. This test creates an egl image based on a 2D-texture, attempts
- * to use the image as target for an external texture, and expects to fail with
- * GL_INVALID_OPERATION.
- */
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
-   config.supports_gl_es_version = 10;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-static EGLImageKHR
-create_tex_based_egl_image(unsigned w, unsigned h, const unsigned char *pixels)
-{
-   GLuint tex;
-   EGLImageKHR img;
-
-   glGenTextures(1, );
-   glBindTexture(GL_TEXTURE_2D, tex);
-
-   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
-  GL_UNSIGNED_BYTE, pixels);
-
-   img = eglCreateImageKHR(eglGetCurrentDisplay(), eglGetCurrentContext(),
-  EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)(intptr_t)tex, 0);
-   if (!img)
-  printf("failed to create EGL image out of texture\n");
-
-   glDeleteTextures(1, );
-
-   return img;
-}
-
-enum piglit_result
-piglit_display(void)
-{
-   GLuint tex;
-   enum piglit_result result = PIGLIT_FAIL;
-   const unsigned char src[] = { 0x00, 0x00, 0x00, 0x00 };
-   EGLImageKHR img = create_tex_based_egl_image(1, 1, src);
-
-   if (img == EGL_NO_IMAGE_KHR)
-  return PIGLIT_FAIL;
-
-

Re: [Piglit] [PATCH v3] arb_blend_func_extended: Test dual src blending without second color output

2018-11-09 Thread Danylo Piliaiev 

Hi,

Since the fix for the underlying issue was pushed to Mesa in 
eca4a6548d0702a7768edb397bad7b72cfc2

could this test be also pushed?

- Danil

On 7/9/18 11:54 AM, Danylo Piliaiev wrote:

Using fragment shader without second color output should not hang gpu
when dual source blending is enabled.
It hanged Intel gen8+ GPUs when discarding fragments and depth test
being enabled.
There is also safeguard against lack of second color output in radeonsi.

v2: by Ilia Mirkin
 - Set supports_gl_compat_version = 30
 - Moved drawing to piglit_display
 - Change drawing sequence to: clear red -> draw -> clear green

v3: by Dylan Baker
 - Removed run_concurrent=False

Signed-off-by: Danylo Piliaiev 
---
  tests/opengl.py   |   2 +
  .../execution/CMakeLists.gl.txt   |   1 +
  .../execution/CMakeLists.gles3.txt|   1 +
  .../dual-src-blending-discard-without-src1.c  | 126 ++
  4 files changed, 130 insertions(+)
  create mode 100644 
tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c

diff --git a/tests/opengl.py b/tests/opengl.py
index 02110ff86..1b088b75f 100644
--- a/tests/opengl.py
+++ b/tests/opengl.py
@@ -4114,6 +4114,7 @@ with profile.test_list.group_manager(
  g(['arb_blend_func_extended-fbo-extended-blend'])
  g(['arb_blend_func_extended-fbo-extended-blend-explicit'])
  g(['arb_blend_func_extended-fbo-extended-blend-pattern'])
+g(['arb_blend_func_extended-dual-src-blending-discard-without-src1'])
  g(['arb_blend_func_extended-blend-api_gles2'])
  g(['arb_blend_func_extended-builtins_gles2'])
  
g(['arb_blend_func_extended-bindfragdataindexed-invalid-parameters_gles3'])
@@ -4123,6 +4124,7 @@ with profile.test_list.group_manager(
  g(['arb_blend_func_extended-fbo-extended-blend-pattern_gles3'])
  g(['arb_blend_func_extended-fbo-extended-blend_gles3'])
  g(['arb_blend_func_extended-fbo-extended-blend-explicit_gles3'])
+g(['arb_blend_func_extended-dual-src-blending-discard-without-src1_gles3'])
  
  with profile.test_list.group_manager(

  PiglitGLTest,
diff --git a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt 
b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
index f48c352e1..09d45b72c 100644
--- a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
@@ -12,4 +12,5 @@ link_libraries (
  piglit_add_executable (arb_blend_func_extended-fbo-extended-blend 
fbo-extended-blend.c)
  piglit_add_executable (arb_blend_func_extended-fbo-extended-blend-explicit 
fbo-extended-blend-explicit.c)
  piglit_add_executable (arb_blend_func_extended-fbo-extended-blend-pattern 
fbo-extended-blend-pattern.c)
+piglit_add_executable 
(arb_blend_func_extended-dual-src-blending-discard-without-src1 
dual-src-blending-discard-without-src1.c)
  # vim: ft=cmake:
diff --git a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt 
b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt
index a70e9fa5e..fd41622bd 100644
--- a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt
+++ b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt
@@ -3,4 +3,5 @@ link_libraries(piglitutil_${piglit_target_api})
  piglit_add_executable 
(arb_blend_func_extended-fbo-extended-blend_${piglit_target_api} 
fbo-extended-blend.c)
  piglit_add_executable 
(arb_blend_func_extended-fbo-extended-blend-explicit_${piglit_target_api} 
fbo-extended-blend-explicit.c)
  piglit_add_executable 
(arb_blend_func_extended-fbo-extended-blend-pattern_${piglit_target_api} 
fbo-extended-blend-pattern.c)
+piglit_add_executable 
(arb_blend_func_extended-dual-src-blending-discard-without-src1_${piglit_target_api}
 dual-src-blending-discard-without-src1.c)
  # vim: ft=cmake:
diff --git 
a/tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
 
b/tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
new file mode 100644
index 0..a0a45cd79
--- /dev/null
+++ 
b/tests/spec/arb_blend_func_extended/execution/dual-src-blending-discard-without-src1.c
@@ -0,0 +1,126 @@
+/* Copyright © 2018 Danylo Piliaiev
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY