Re: [Piglit] [PATCH] arb_compute_variable_group_size: Add GL_ARB_compute_variable_group_size requirement

[Matt Turner]

On Mon, Oct 17, 2016 at 6:04 PM, Ian Romanick  wrote:
> From: Ian Romanick 
>
> Signed-off-by: Ian Romanick 

I actually sent and committed this patch earlier today.
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH] arb_compute_variable_group_size: Add GL_ARB_compute_variable_group_size requirement

[Ian Romanick]

From: Ian Romanick 

Signed-off-by: Ian Romanick 
---
 .../linker/mixed_fixed_variable_local_work_size.shader_test  | 1 +
 .../linker/no_local_size_specified.shader_test   | 1 +
 2 files changed, 2 insertions(+)

diff --git 
a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
 
b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
index d660d56..74bc3f6 100644
--- 
a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
+++ 
b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
@@ -8,6 +8,7 @@
 GL >= 3.3
 GLSL >= 3.30
 GL_ARB_compute_shader
+GL_ARB_compute_variable_group_size
 
 [compute shader]
 #version 330
diff --git 
a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
 
b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
index 6371c29..f5b3e91 100644
--- 
a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
+++ 
b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
@@ -8,6 +8,7 @@
 GL >= 3.3
 GLSL >= 3.30
 GL_ARB_compute_shader
+GL_ARB_compute_variable_group_size
 
 [compute shader]
 #version 330
-- 
2.5.5

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

Re: [Piglit] [PATCH] arb_compute_variable_group_size: Fix require section.

[Dylan Baker]

Quoting Matt Turner (2016-10-17 13:33:11)
> On Mon, Oct 17, 2016 at 12:54 PM, Samuel Pitoiset
>  wrote:
> >
> >
> > On 10/17/2016 09:45 PM, Samuel Pitoiset wrote:
> >>
> >> Thanks for fixing this.
> >>
> >> Reviewed-by: Samuel Pitoiset 
> >
> >
> > Actually, we need to check for both ARB_compute_shader and
> > ARB_compute_variable_group_size since
> > https://cgit.freedesktop.org/mesa/mesa/commit/?id=8785a8ff8948385a913e9bd75e8cdd1092bd750f.
> 
> Strange. Shouldn't a [compute shader] section (or requiring
> GL_ARB_compute_variable_group_size) be sufficient?

No, [computer shader] doesn't imply the requirement. The way shader runner is
implemented it checks the [require] block, then if everything seems good starts
compiling and linking, and doesn't expect errors. So you either need the GL/GLSL
version to imply the extension or to ask for it explicitly.

The fast skipping code in the python layer has the same limitations

Dylan

> 
> I'll make the change regardless.
> ___
> Piglit mailing list
> Piglit@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit


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

Re: [Piglit] [PATCH] arb_compute_variable_group_size: Fix require section.

[Samuel Pitoiset]

On 10/17/2016 10:33 PM, Matt Turner wrote:

On Mon, Oct 17, 2016 at 12:54 PM, Samuel Pitoiset
 wrote:



On 10/17/2016 09:45 PM, Samuel Pitoiset wrote:


Thanks for fixing this.

Reviewed-by: Samuel Pitoiset 



Actually, we need to check for both ARB_compute_shader and
ARB_compute_variable_group_size since
https://cgit.freedesktop.org/mesa/mesa/commit/?id=8785a8ff8948385a913e9bd75e8cdd1092bd750f.


Strange. Shouldn't a [compute shader] section (or requiring
GL_ARB_compute_variable_group_size) be sufficient?


Doesn't seem like.



I'll make the change regardless.


Nicolai also submitted a patch pretty similar to this one, except that 
he checks for both extensions.





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

Re: [Piglit] [PATCH] framework/programs/run.py: Allow comments in test-list files.

[Dylan Baker]

Quoting Petri Latvala (2016-10-17 02:52:36)
> IGT testing in Intel's CI is using a static list of tests to
> run. Commenting out tests and annotating them will help
> human-readability.
> 
> Signed-off-by: Petri Latvala 
> ---
> 
> Possible duplicate, I didn't see this arrive on the mailing list myself
> 
> framework/programs/run.py | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/framework/programs/run.py b/framework/programs/run.py
> index ecfc36f..7921816 100644
> --- a/framework/programs/run.py
> +++ b/framework/programs/run.py
> @@ -325,8 +325,9 @@ def run(input_):
>  # If a test list is provided then set the forced_test_list value.
>  if args.test_list:
>  with open(args.test_list) as test_list:
> -# Strip newlines
> -profile.forced_test_list = list([t.strip() for t in test_list])
> +# Strip newlines and comments, ignore empty lines
> +stripped = [t.split('#')[0].strip() for t in test_list]
> +profile.forced_test_list = list(filter(None, stripped))

We don't use map or filter in piglit, we use comprehensions, This also creates a
concrete list for stripped, it would be better to use a generator for that.

I think you could implement this in our style as something like this (I say
think because this isn't tested):

stripped = (t.split('#')[0].strip() for t in test_list)
profile.forced_test_list = [x for x in stripped if x]

Dylan

>  
>  results.time_elapsed.start = time.time()
>  # Set the dmesg type
> -- 
> 2.9.3
> 
> ___
> Piglit mailing list
> Piglit@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit


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

Re: [Piglit] [PATCH] arb_compute_variable_group_size: add ARB_compute_shader enables

[Matt Turner]

On Mon, Oct 17, 2016 at 12:38 PM, Nicolai Hähnle  wrote:
> From: Nicolai Hähnle 
>
> Without those, many of the tests started failing now that Mesa explicitly
> checks for the compute shader enable in the compiler.
> ---

The strange thing is that ARB_compute_shader doesn't say anything
about an #extension GL_ARB_compute_shader. I suppose it's just an
oversight.

I'll commit my patch, since it should just add the dependency on
GL_ARB_compute_variable_group_size with Samuel's feedback
incorporated.

I have no problem with this patch.
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH] arb_compute_variable_group_size: Fix require section.

[Matt Turner]

On Mon, Oct 17, 2016 at 12:54 PM, Samuel Pitoiset
 wrote:
>
>
> On 10/17/2016 09:45 PM, Samuel Pitoiset wrote:
>>
>> Thanks for fixing this.
>>
>> Reviewed-by: Samuel Pitoiset 
>
>
> Actually, we need to check for both ARB_compute_shader and
> ARB_compute_variable_group_size since
> https://cgit.freedesktop.org/mesa/mesa/commit/?id=8785a8ff8948385a913e9bd75e8cdd1092bd750f.

Strange. Shouldn't a [compute shader] section (or requiring
GL_ARB_compute_variable_group_size) be sufficient?

I'll make the change regardless.
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH] arb_compute_variable_group_size: Fix require section.

[Samuel Pitoiset]

On 10/17/2016 09:45 PM, Samuel Pitoiset wrote:

Thanks for fixing this.

Reviewed-by: Samuel Pitoiset 


Actually, we need to check for both ARB_compute_shader and 
ARB_compute_variable_group_size since 
https://cgit.freedesktop.org/mesa/mesa/commit/?id=8785a8ff8948385a913e9bd75e8cdd1092bd750f.




On 10/17/2016 09:39 PM, Matt Turner wrote:

---
 .../linker/mixed_fixed_variable_local_work_size.shader_test
| 2 +-
 .../linker/no_local_size_specified.shader_test
| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git
a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test

index d660d56..32088ad 100644
---
a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test

+++
b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test

@@ -7,7 +7,7 @@
 [require]
 GL >= 3.3
 GLSL >= 3.30
-GL_ARB_compute_shader
+GL_ARB_compute_variable_group_size

 [compute shader]
 #version 330
diff --git
a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test

index 6371c29..92a1646 100644
---
a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test

+++
b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test

@@ -7,7 +7,7 @@
 [require]
 GL >= 3.3
 GLSL >= 3.30
-GL_ARB_compute_shader
+GL_ARB_compute_variable_group_size

 [compute shader]
 #version 330


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

Re: [Piglit] [PATCH] arb_compute_variable_group_size: add ARB_compute_shader enables

[Samuel Pitoiset]

On 10/17/2016 09:38 PM, Nicolai Hähnle wrote:

From: Nicolai Hähnle 

Without those, many of the tests started failing now that Mesa explicitly
checks for the compute shader enable in the compiler.


Well, ARB_compute_variable_group_size requires ARB_compute_shader, 
that's why I didn't check it initially. But if mesa now checks for 
compute shaders availability, this makes sense.


Your patch will conflict with Matt's one though, but this looks better 
to me actually.


Reviewed-by: Samuel Pitoiset 


---
 tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp | 1 +
 .../compiler/gl_LocalGroupSizeARB_illegal_use.comp  | 1 +
 .../compiler/gl_LocalGroupSizeARB_layout.comp   | 1 +
 tests/spec/arb_compute_variable_group_size/errors.c | 1 +
 .../execution/basic-local-size.shader_test  | 1 +
 .../linker/mixed_fixed_variable_local_work_size.shader_test | 2 ++
 .../linker/no_local_size_specified.shader_test  | 2 ++
 tests/spec/arb_compute_variable_group_size/local-size.c | 1 +
 8 files changed, 10 insertions(+)

diff --git 
a/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp 
b/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp
index 95c061b..ae2e973 100644
--- a/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp
+++ b/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp
@@ -1,14 +1,15 @@
 // [config]
 // expect_result: pass
 // glsl_version: 3.30
 // require_extensions: GL_ARB_compute_variable_group_size
 // [end config]

 #version 330
+#extension GL_ARB_compute_shader: enable
 #extension GL_ARB_compute_variable_group_size: enable

 layout(local_size_variable) in;

 void main()
 {
 }
diff --git 
a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp
 
b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp
index f8fcf92..5eb8f4d 100644
--- 
a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp
+++ 
b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp
@@ -11,18 +11,19 @@
 // example, a shader might want to declare a shared variable with one
 // instance per work group invocation, such as:
 //
 // shared float shared_values[gl_WorkGroupSize.x *
 //gl_WorkGroupSize.y * gl_WorkGroupSize.z];
 //
 // Such declarations would be illegal using the input
 // "gl_LocalGroupSizeARB".

 #version 330
+#extension GL_ARB_compute_shader: enable
 #extension GL_ARB_compute_variable_group_size: enable

 layout(local_size_variable) in;

 void main()
 {
uint v[gl_LocalGroupSizeARB.x];
 }
diff --git 
a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp
 
b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp
index 953856e..d575001 100644
--- 
a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp
+++ 
b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp
@@ -10,18 +10,19 @@
 // variable containing the local work group size for the current compute-
 // shader work group. For compute shaders with a fixed local group size
 // (using *local_size_x*, *local_size_y*, or *local_size_z* layout
 // qualifiers), its value will be the same as the constant
 // /gl_WorkGroupSize/. For compute shaders with a variable local group size
 // (using *local_size_variable*), the value of /gl_LocalGroupSizeARB/ will
 // be the work group size specified in the OpenGL API command dispatching
 // the current compute shader work.

 #version 330
+#extension GL_ARB_compute_shader: enable
 #extension GL_ARB_compute_variable_group_size: enable

 layout(local_size_variable) in;

 void main()
 {
uvec3 size = gl_LocalGroupSizeARB;
 }
diff --git a/tests/spec/arb_compute_variable_group_size/errors.c 
b/tests/spec/arb_compute_variable_group_size/errors.c
index 19945d1..82bae42 100644
--- a/tests/spec/arb_compute_variable_group_size/errors.c
+++ b/tests/spec/arb_compute_variable_group_size/errors.c
@@ -35,20 +35,21 @@ static struct piglit_gl_test_config *piglit_config;
 PIGLIT_GL_TEST_CONFIG_BEGIN

piglit_config = 
config.supports_gl_compat_version = 33;
config.supports_gl_core_version = 33;

 PIGLIT_GL_TEST_CONFIG_END

 static const char *variable_work_group_size_shader =
"#version 330\n"
+   "#extension GL_ARB_compute_shader: enable\n"
"#extension GL_ARB_compute_variable_group_size: enable\n"
"\n"
"layout(local_size_variable) in;\n"
"\n"
"void main()\n"
"{\n"
"}\n";

 static const char *fixed_work_group_size_shader =

Re: [Piglit] [PATCH] arb_compute_variable_group_size: Fix require section.

[Samuel Pitoiset]

Thanks for fixing this.

Reviewed-by: Samuel Pitoiset 

On 10/17/2016 09:39 PM, Matt Turner wrote:

---
 .../linker/mixed_fixed_variable_local_work_size.shader_test | 2 +-
 .../linker/no_local_size_specified.shader_test  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
 
b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
index d660d56..32088ad 100644
--- 
a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
+++ 
b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
@@ -7,7 +7,7 @@
 [require]
 GL >= 3.3
 GLSL >= 3.30
-GL_ARB_compute_shader
+GL_ARB_compute_variable_group_size

 [compute shader]
 #version 330
diff --git 
a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
 
b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
index 6371c29..92a1646 100644
--- 
a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
+++ 
b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
@@ -7,7 +7,7 @@
 [require]
 GL >= 3.3
 GLSL >= 3.30
-GL_ARB_compute_shader
+GL_ARB_compute_variable_group_size

 [compute shader]
 #version 330


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

Re: [Piglit] [PATCH] arb_compute_variable_group_size: Fix require section.

[Jordan Justen]

Reviewed-by: Jordan Justen 

On 2016-10-17 12:39:18, Matt Turner wrote:
> ---
>  .../linker/mixed_fixed_variable_local_work_size.shader_test | 2 
> +-
>  .../linker/no_local_size_specified.shader_test  | 2 
> +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git 
> a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
>  
> b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
> index d660d56..32088ad 100644
> --- 
> a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
> +++ 
> b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
> @@ -7,7 +7,7 @@
>  [require]
>  GL >= 3.3
>  GLSL >= 3.30
> -GL_ARB_compute_shader
> +GL_ARB_compute_variable_group_size
>  
>  [compute shader]
>  #version 330
> diff --git 
> a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
>  
> b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
> index 6371c29..92a1646 100644
> --- 
> a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
> +++ 
> b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
> @@ -7,7 +7,7 @@
>  [require]
>  GL >= 3.3
>  GLSL >= 3.30
> -GL_ARB_compute_shader
> +GL_ARB_compute_variable_group_size
>  
>  [compute shader]
>  #version 330
> -- 
> 2.7.3
> 
> ___
> 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] arb_compute_variable_group_size: Fix require section.

[Matt Turner]

---
 .../linker/mixed_fixed_variable_local_work_size.shader_test | 2 +-
 .../linker/no_local_size_specified.shader_test  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
 
b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
index d660d56..32088ad 100644
--- 
a/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
+++ 
b/tests/spec/arb_compute_variable_group_size/linker/mixed_fixed_variable_local_work_size.shader_test
@@ -7,7 +7,7 @@
 [require]
 GL >= 3.3
 GLSL >= 3.30
-GL_ARB_compute_shader
+GL_ARB_compute_variable_group_size
 
 [compute shader]
 #version 330
diff --git 
a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
 
b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
index 6371c29..92a1646 100644
--- 
a/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
+++ 
b/tests/spec/arb_compute_variable_group_size/linker/no_local_size_specified.shader_test
@@ -7,7 +7,7 @@
 [require]
 GL >= 3.3
 GLSL >= 3.30
-GL_ARB_compute_shader
+GL_ARB_compute_variable_group_size
 
 [compute shader]
 #version 330
-- 
2.7.3

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

[Piglit] [PATCH] arb_compute_variable_group_size: add ARB_compute_shader enables

[Nicolai Hähnle]

From: Nicolai Hähnle 

Without those, many of the tests started failing now that Mesa explicitly
checks for the compute shader enable in the compiler.
---
 tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp | 1 +
 .../compiler/gl_LocalGroupSizeARB_illegal_use.comp  | 1 +
 .../compiler/gl_LocalGroupSizeARB_layout.comp   | 1 +
 tests/spec/arb_compute_variable_group_size/errors.c | 1 +
 .../execution/basic-local-size.shader_test  | 1 +
 .../linker/mixed_fixed_variable_local_work_size.shader_test | 2 ++
 .../linker/no_local_size_specified.shader_test  | 2 ++
 tests/spec/arb_compute_variable_group_size/local-size.c | 1 +
 8 files changed, 10 insertions(+)

diff --git 
a/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp 
b/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp
index 95c061b..ae2e973 100644
--- a/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp
+++ b/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp
@@ -1,14 +1,15 @@
 // [config]
 // expect_result: pass
 // glsl_version: 3.30
 // require_extensions: GL_ARB_compute_variable_group_size
 // [end config]
 
 #version 330
+#extension GL_ARB_compute_shader: enable
 #extension GL_ARB_compute_variable_group_size: enable
 
 layout(local_size_variable) in;
 
 void main()
 {
 }
diff --git 
a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp
 
b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp
index f8fcf92..5eb8f4d 100644
--- 
a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp
+++ 
b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp
@@ -11,18 +11,19 @@
 // example, a shader might want to declare a shared variable with one
 // instance per work group invocation, such as:
 //
 // shared float shared_values[gl_WorkGroupSize.x *
 //gl_WorkGroupSize.y * gl_WorkGroupSize.z];
 //
 // Such declarations would be illegal using the input
 // "gl_LocalGroupSizeARB".
 
 #version 330
+#extension GL_ARB_compute_shader: enable
 #extension GL_ARB_compute_variable_group_size: enable
 
 layout(local_size_variable) in;
 
 void main()
 {
uint v[gl_LocalGroupSizeARB.x];
 }
diff --git 
a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp
 
b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp
index 953856e..d575001 100644
--- 
a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp
+++ 
b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp
@@ -10,18 +10,19 @@
 // variable containing the local work group size for the current compute-
 // shader work group. For compute shaders with a fixed local group size
 // (using *local_size_x*, *local_size_y*, or *local_size_z* layout
 // qualifiers), its value will be the same as the constant
 // /gl_WorkGroupSize/. For compute shaders with a variable local group size
 // (using *local_size_variable*), the value of /gl_LocalGroupSizeARB/ will
 // be the work group size specified in the OpenGL API command dispatching
 // the current compute shader work.
 
 #version 330
+#extension GL_ARB_compute_shader: enable
 #extension GL_ARB_compute_variable_group_size: enable
 
 layout(local_size_variable) in;
 
 void main()
 {
uvec3 size = gl_LocalGroupSizeARB;
 }
diff --git a/tests/spec/arb_compute_variable_group_size/errors.c 
b/tests/spec/arb_compute_variable_group_size/errors.c
index 19945d1..82bae42 100644
--- a/tests/spec/arb_compute_variable_group_size/errors.c
+++ b/tests/spec/arb_compute_variable_group_size/errors.c
@@ -35,20 +35,21 @@ static struct piglit_gl_test_config *piglit_config;
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
piglit_config = 
config.supports_gl_compat_version = 33;
config.supports_gl_core_version = 33;
 
 PIGLIT_GL_TEST_CONFIG_END
 
 static const char *variable_work_group_size_shader =
"#version 330\n"
+   "#extension GL_ARB_compute_shader: enable\n"
"#extension GL_ARB_compute_variable_group_size: enable\n"
"\n"
"layout(local_size_variable) in;\n"
"\n"
"void main()\n"
"{\n"
"}\n";
 
 static const char *fixed_work_group_size_shader =
"#version 330\n"
diff --git 
a/tests/spec/arb_compute_variable_group_size/execution/basic-local-size.shader_test
 
b/tests/spec/arb_compute_variable_group_size/execution/basic-local-size.shader_test
index 108ebd5..75c93f7 100644
--- 
a/tests/spec/arb_compute_variable_group_size/execution/basic-local-size.shader_test
+++ 

Re: [Piglit] [PATCH 1/4] util: Link to gbm if gbm is used

[Anuj Phogat]

On Thu, Oct 13, 2016 at 3:09 PM, Chad Versace  wrote:
> If PIGLIT_HAS_GBM, then add GBM_LDFLAGS to the linker flags. Fixes
> undefined symbol errors at link time for me, using Arch Linux.
> ---
>  tests/util/CMakeLists.txt | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
> index 3d5bef5..277386e 100644
> --- a/tests/util/CMakeLists.txt
> +++ b/tests/util/CMakeLists.txt
> @@ -81,6 +81,9 @@ if(PIGLIT_USE_WAFFLE)
> list(APPEND UTIL_GL_SOURCES
> piglit-framework-gl/piglit_gbm_framework.c
> )
> +   list(APPEND UTIL_GL_LIBS
> +   ${GBM_LDFLAGS}
> +   )
> endif()
> if(PIGLIT_HAS_WAYLAND)
> list(APPEND UTIL_GL_SOURCES
> --
> 2.10.0
>
> ___
> Piglit mailing list
> Piglit@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit

For the series:
Reviewed-by: Anuj Phogat 
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH v6] cl: Add a test for the predefined macros

[Serge Martin]

Le 2016-10-17 16:20, Jan Vesely a écrit :

On Sat, 2016-10-15 at 14:43 +0200, Niels Ole Salscheider wrote:

v6: Fix OpenCL C version test if test is compiled against OpenCL 1.0
v5: Use sscanf, fix CL_DEVICE_OPENCL_C_VERSION include guard, fix 
logic

v4: Test against env->version instead of opencl_version and never
report PIGLIT_SKIP for the values of IMAGE_SUPPORT and 
ENDIAN_LITTLE

v3: Fix alignment and typos
v2: Check the values of the defines and add more checks

Signed-off-by: Niels Ole Salscheider 
Reviewed-by: Jan Vesely 
---
 tests/cl.py  |   1 +
 tests/cl/program/CMakeLists.cl.txt   |   1 +
 tests/cl/program/predefined-macros.c | 463 
+++

 3 files changed, 465 insertions(+)
 create mode 100644 tests/cl/program/predefined-macros.c

diff --git a/tests/cl.py b/tests/cl.py
index 353ab05..73fba0d 100644
--- a/tests/cl.py
+++ b/tests/cl.py
@@ -96,6 +96,7 @@ with profile.group_manager(PiglitCLTest, 'program') 
as g:

 g(['cl-program-max-work-item-sizes'],
   'Run kernel with max work item sizes')
 g(['cl-program-bitcoin-phatk'], 'Bitcoin: phatk kernel')
+g(['cl-program-predefined-macros'], 'Check predefined 
preprocessor macros')


 with profile.group_manager(PiglitCLTest, 'interop') as g:
 g(['cl-interop-egl_khr_cl_event2'], 'EGL_KHR_cl_event2')
diff --git a/tests/cl/program/CMakeLists.cl.txt 
b/tests/cl/program/CMakeLists.cl.txt

index 82dc675..c8d7307 100644
--- a/tests/cl/program/CMakeLists.cl.txt
+++ b/tests/cl/program/CMakeLists.cl.txt
@@ -1,3 +1,4 @@
 piglit_cl_add_program_test (tester program-tester.c)
 piglit_cl_add_program_test (max-work-item-sizes 
max-work-item-sizes.c)

 piglit_cl_add_program_test (bitcoin-phatk bitcoin-phatk.c)
+piglit_cl_add_program_test (predefined-macros predefined-macros.c)
diff --git a/tests/cl/program/predefined-macros.c 
b/tests/cl/program/predefined-macros.c

new file mode 100644
index 000..f94812c
--- /dev/null
+++ b/tests/cl/program/predefined-macros.c
@@ -0,0 +1,463 @@
+/*
+ * Copyright © 2016 Niels Ole Salscheider 


+ *
+ * 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 "piglit-framework-cl-program.h"
+
+char *program_source =
+"kernel void test(global int* file_defined, global int* line_defined, 
\n"
+" global int* opencl_version_defined, global int* 
opencl_version, \n"
+" global int* opencl_c_version_defined, global int* 
opencl_c_version, \n"
+" global int* cl_version_defined, global int* 
cl_version, \n"
+" global int* endian_little_defined, global int* 
endian_little, \n"
+" global int* image_support_defined, global int* 
image_support) \n"

+"{ \n"
+"#ifdef __FILE__ \n"
+" *file_defined = 1; \n"
+"#else \n"
+" *file_defined = 0; \n"
+"#endif \n"
+"\n"
+"#ifdef __LINE__ \n"
+" *line_defined = 1; \n"
+"#else \n"
+" *line_defined = 0; \n"
+"#endif \n"
+"\n"
+"#ifdef __OPENCL_VERSION__ \n"
+" *opencl_version_defined = 1; \n"
+" *opencl_version = __OPENCL_VERSION__; \n"
+"#else \n"
+" *opencl_version_defined = 0; \n"
+"#endif \n"
+"\n"
+"#ifdef __OPENCL_C_VERSION__ \n"
+" *opencl_c_version_defined = 1; \n"
+" *opencl_c_version = __OPENCL_C_VERSION__; \n"
+"#else \n"
+" *opencl_c_version_defined = 0; \n"
+"#endif \n"
+"\n"
+"#ifdef CL_VERSION_1_0 \n"
+" cl_version_defined[0] = 1; \n"
+" cl_version[0] = CL_VERSION_1_0; \n"
+"#else \n"
+" cl_version_defined[0] = 0; \n"
+"#endif \n"
+"\n"
+"#ifdef CL_VERSION_1_1 \n"
+" cl_version_defined[1] = 1; \n"
+" cl_version[1] = CL_VERSION_1_1; \n"
+"#else \n"
+" cl_version_defined[1] = 0; \n"
+"#endif \n"
+"\n"
+"#ifdef CL_VERSION_1_2 \n"
+" cl_version_defined[2] = 1; \n"
+" cl_version[2] = CL_VERSION_1_2; \n"
+"#else \n"
+" cl_version_defined[2] = 0; \n"
+"#endif \n"
+"\n"
+"#ifdef 

[Piglit] [PATCH 2/2] arb_gpu_shader_fp64: add some inout function argument tests

[Nicolai Hähnle]

From: Nicolai Hähnle 

This exposes a bug in st_glsl_to_tgsi.
---
 .../execution/fs-function-inout-array.shader_test  | 43 ++
 1 file changed, 43 insertions(+)
 create mode 100644 
tests/spec/arb_gpu_shader_fp64/execution/fs-function-inout-array.shader_test

diff --git 
a/tests/spec/arb_gpu_shader_fp64/execution/fs-function-inout-array.shader_test 
b/tests/spec/arb_gpu_shader_fp64/execution/fs-function-inout-array.shader_test
new file mode 100644
index 000..5ba2004
--- /dev/null
+++ 
b/tests/spec/arb_gpu_shader_fp64/execution/fs-function-inout-array.shader_test
@@ -0,0 +1,43 @@
+# Test inout double arrays passed to functions.
+
+[require]
+GLSL >= 1.50
+GL_ARB_gpu_shader_fp64
+
+[vertex shader passthrough]
+
+[fragment shader]
+#version 150
+#extension GL_ARB_gpu_shader_fp64 : require
+
+out vec4 ocolor;
+
+void multiply(inout double array[4])
+{
+   for (int i = 0; i < 4; ++i) {
+   array[i] *= i;
+   }
+}
+
+void main()
+{
+   double array[4];
+
+   for (int i = 0; i < 4; ++i)
+   array[i] = 1.0;
+
+   multiply(array);
+
+   for (int i = 0; i < 4; ++i) {
+   if (array[i] != double(i)) {
+   ocolor = vec4(1.0, float(i) / 255.0, array[i] / 255.0, 
1.0);
+   return;
+   }
+   }
+
+   ocolor = vec4(0.0, 1.0, 0.0, 1.0);
+}
+
+[test]
+draw rect -1 -1 2 2
+probe all rgba 0.0 1.0 0.0 1.0
-- 
2.7.4

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

[Piglit] [PATCH 1/2] glsl-1.20: test array of structs inout parameter

[Nicolai Hähnle]

From: Nicolai Hähnle 

This exposes a bug in st_glsl_to_tgsi.
---
 .../fs-function-inout-array-of-structs.shader_test | 55 ++
 1 file changed, 55 insertions(+)
 create mode 100644 
tests/spec/glsl-1.20/execution/fs-function-inout-array-of-structs.shader_test

diff --git 
a/tests/spec/glsl-1.20/execution/fs-function-inout-array-of-structs.shader_test 
b/tests/spec/glsl-1.20/execution/fs-function-inout-array-of-structs.shader_test
new file mode 100644
index 000..e0af00d
--- /dev/null
+++ 
b/tests/spec/glsl-1.20/execution/fs-function-inout-array-of-structs.shader_test
@@ -0,0 +1,55 @@
+# Test inout arrays of structs passed to functions.
+
+[require]
+GLSL >= 1.20
+
+[vertex shader passthrough]
+
+[fragment shader]
+#version 120
+
+struct S {
+   ivec4 v;
+};
+
+void multiply(inout S array[4])
+{
+   for (int i = 0; i < 4; ++i) {
+   array[i].v *= i;
+   }
+}
+
+void main()
+{
+   S array[4];
+
+   for (int i = 0; i < 4; ++i)
+   array[i].v = ivec4(0, 1, 2, 3);
+
+   multiply(array);
+
+   for (int i = 0; i < 4; ++i) {
+   if (array[i].v.x != 0) {
+   gl_FragColor = vec4(1.0, 0.0, float(i) / 255.0, 
float(array[i].v.x) / 255.0);
+   return;
+   }
+   if (array[i].v.y != 1 * i) {
+   gl_FragColor = vec4(1.0, 0.1, float(i) / 255.0, 
float(array[i].v.y) / 255.0);
+   return;
+   }
+   if (array[i].v.z != 2 * i) {
+   gl_FragColor = vec4(1.0, 0.2, float(i) / 255.0, 
float(array[i].v.z) / 255.0);
+   return;
+   }
+   if (array[i].v.w != 3 * i) {
+   gl_FragColor = vec4(1.0, 0.3, float(i) / 255.0, 
float(array[i].v.w) / 255.0);
+   return;
+   }
+   }
+
+   gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
+}
+
+[test]
+draw rect -1 -1 2 2
+probe all rgba 0.0 1.0 0.0 1.0
-- 
2.7.4

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

Re: [Piglit] [PATCH v2] arb_gpu_shader_fp64: Add tests to check float to double conversion under non-uniform control flow

[Nicolai Hähnle]

Reviewed-by: Nicolai Hähnle 

On 17.10.2016 08:26, Samuel Iglesias Gonsálvez wrote:

We found issues with this case while developing i965's Ivybridge
patches to support arb_gpu_shader_fp64.

Signed-off-by: Samuel Iglesias Gonsálvez 
---
 .../fs-non-uniform-control-flow-f2d.shader_test| 40 ++
 1 file changed, 40 insertions(+)
 create mode 100644 
tests/spec/arb_gpu_shader_fp64/execution/fs-non-uniform-control-flow-f2d.shader_test

diff --git 
a/tests/spec/arb_gpu_shader_fp64/execution/fs-non-uniform-control-flow-f2d.shader_test
 
b/tests/spec/arb_gpu_shader_fp64/execution/fs-non-uniform-control-flow-f2d.shader_test
new file mode 100644
index 000..4b4011e
--- /dev/null
+++ 
b/tests/spec/arb_gpu_shader_fp64/execution/fs-non-uniform-control-flow-f2d.shader_test
@@ -0,0 +1,40 @@
+# It checks that a float to double conversion works correctly when it is
+# under non-uniform control flow.
+
+[require]
+GLSL >= 3.30
+GL_ARB_gpu_shader_fp64
+
+[vertex shader passthrough]
+
+[fragment shader]
+#version 330
+#extension GL_ARB_gpu_shader_fp64 : require
+out vec4 color;
+
+void main() {
+int cx = int(gl_FragCoord.x) / 125;
+int cy = int(gl_FragCoord.y) / 125;
+dvec2 rg;
+vec2 value;
+if ((cx + cy) % 2 == 0)
+value = vec2(1.0f, 0.0f);
+else
+value = vec2(0.0f, 1.0f);
+rg = dvec2(value);
+if (rg == dvec2(0, 1))
+color = vec4(0, 0, 1, 1);
+else
+color = vec4(rg, 0, 1);
+}
+
+
+[test]
+clear color 0.0 0.0 0.0 0.0
+clear
+draw rect -1 -1 2 2
+probe rgba 0 0 1.0 0.0 0.0 1.0
+probe rgba 125 0 0.0 0.0 1.0 1.0
+probe rgba 0 125 0.0 0.0 1.0 1.0
+probe rgba 125 125 1.0 0.0 0.0 1.0
+


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

Re: [Piglit] [PATCH v6] cl: Add a test for the predefined macros

[Jan Vesely]

On Sat, 2016-10-15 at 14:43 +0200, Niels Ole Salscheider wrote:
> v6: Fix OpenCL C version test if test is compiled against OpenCL 1.0
> v5: Use sscanf, fix CL_DEVICE_OPENCL_C_VERSION include guard, fix logic
> v4: Test against env->version instead of opencl_version and never
> report PIGLIT_SKIP for the values of IMAGE_SUPPORT and ENDIAN_LITTLE
> v3: Fix alignment and typos
> v2: Check the values of the defines and add more checks
> 
> Signed-off-by: Niels Ole Salscheider 
> Reviewed-by: Jan Vesely 
> ---
>  tests/cl.py  |   1 +
>  tests/cl/program/CMakeLists.cl.txt   |   1 +
>  tests/cl/program/predefined-macros.c | 463 
> +++
>  3 files changed, 465 insertions(+)
>  create mode 100644 tests/cl/program/predefined-macros.c
> 
> diff --git a/tests/cl.py b/tests/cl.py
> index 353ab05..73fba0d 100644
> --- a/tests/cl.py
> +++ b/tests/cl.py
> @@ -96,6 +96,7 @@ with profile.group_manager(PiglitCLTest, 'program') as g:
>  g(['cl-program-max-work-item-sizes'],
>'Run kernel with max work item sizes')
>  g(['cl-program-bitcoin-phatk'], 'Bitcoin: phatk kernel')
> +g(['cl-program-predefined-macros'], 'Check predefined preprocessor 
> macros')
>  
>  with profile.group_manager(PiglitCLTest, 'interop') as g:
>  g(['cl-interop-egl_khr_cl_event2'], 'EGL_KHR_cl_event2')
> diff --git a/tests/cl/program/CMakeLists.cl.txt 
> b/tests/cl/program/CMakeLists.cl.txt
> index 82dc675..c8d7307 100644
> --- a/tests/cl/program/CMakeLists.cl.txt
> +++ b/tests/cl/program/CMakeLists.cl.txt
> @@ -1,3 +1,4 @@
>  piglit_cl_add_program_test (tester program-tester.c)
>  piglit_cl_add_program_test (max-work-item-sizes max-work-item-sizes.c)
>  piglit_cl_add_program_test (bitcoin-phatk bitcoin-phatk.c)
> +piglit_cl_add_program_test (predefined-macros predefined-macros.c)
> diff --git a/tests/cl/program/predefined-macros.c 
> b/tests/cl/program/predefined-macros.c
> new file mode 100644
> index 000..f94812c
> --- /dev/null
> +++ b/tests/cl/program/predefined-macros.c
> @@ -0,0 +1,463 @@
> +/*
> + * Copyright © 2016 Niels Ole Salscheider 
> + *
> + * 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 "piglit-framework-cl-program.h"
> +
> +char *program_source =
> +"kernel void test(global int* file_defined, global int* line_defined, \n"
> +" global int* opencl_version_defined, global int* 
> opencl_version, \n"
> +" global int* opencl_c_version_defined, global int* 
> opencl_c_version, \n"
> +" global int* cl_version_defined, global int* cl_version, \n"
> +" global int* endian_little_defined, global int* 
> endian_little, \n"
> +" global int* image_support_defined, global int* 
> image_support) \n"
> +"{ \n"
> +"#ifdef __FILE__ \n"
> +"*file_defined = 1; \n"
> +"#else \n"
> +"*file_defined = 0; \n"
> +"#endif \n"
> +"\n"
> +"#ifdef __LINE__ \n"
> +"*line_defined = 1; \n"
> +"#else \n"
> +"*line_defined = 0; \n"
> +"#endif \n"
> +"\n"
> +"#ifdef __OPENCL_VERSION__ \n"
> +"*opencl_version_defined = 1; \n"
> +"*opencl_version = __OPENCL_VERSION__; \n"
> +"#else \n"
> +"*opencl_version_defined = 0; \n"
> +"#endif \n"
> +"\n"
> +"#ifdef __OPENCL_C_VERSION__ \n"
> +"*opencl_c_version_defined = 1; \n"
> +"*opencl_c_version = __OPENCL_C_VERSION__; \n"
> +"#else \n"
> +"*opencl_c_version_defined = 0; \n"
> +"#endif \n"
> +"\n"
> +"#ifdef CL_VERSION_1_0 \n"
> +"cl_version_defined[0] = 1; \n"
> +"cl_version[0] = CL_VERSION_1_0; \n"
> +"#else \n"
> +"cl_version_defined[0] = 0; \n"
> +"#endif \n"
> +"\n"
> +"#ifdef CL_VERSION_1_1 \n"
> +"cl_version_defined[1] = 1; \n"
> +"cl_version[1] = CL_VERSION_1_1; \n"
> +"#else \n"
> +"

Re: [Piglit] [PATCH] fbo-clear-formats: Do one of the 4 clears unscissored.

[Marek Olšák]

Reviewed-by: Marek Olšák 

Marek

On Sat, Oct 15, 2016 at 1:36 AM, Eric Anholt  wrote:
> I was surprised to find through DEQP that 565 clearing was broken on
> vc4, but that was because fbo-clear-formats never hit the hardware
> clear path.  This gives us a little exposure for that path (enough to
> catch the bug) without changing our clear colors have unique values in
> each channel.
> ---
>  tests/fbo/fbo-clear-formats.c | 8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/tests/fbo/fbo-clear-formats.c b/tests/fbo/fbo-clear-formats.c
> index 4c9a391fe87e..8289182d6628 100644
> --- a/tests/fbo/fbo-clear-formats.c
> +++ b/tests/fbo/fbo-clear-formats.c
> @@ -102,12 +102,14 @@ do_rgba_clear(GLenum format, GLuint tex, int level, int 
> size)
> return true;
> }
>
> -   glEnable(GL_SCISSOR_TEST);
> -
> -   glScissor(0, 0, size / 2, size / 2);
> +   /* Do the first clear unscissored, to give a bit of exposure
> +* to hardware fast-clearing paths on tiled renderers that
> +* require unscissored clears.
> +*/
> glClearColor(red[0], red[1], red[2], red[3]);
> glClear(GL_COLOR_BUFFER_BIT);
>
> +   glEnable(GL_SCISSOR_TEST);
> glScissor(size / 2, 0, size / 2, size / 2);
> glClearColor(green[0], green[1], green[2], green[3]);
> glClear(GL_COLOR_BUFFER_BIT);
> --
> 2.9.3
>
> ___
> 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] framework/programs/run.py: Allow comments in test-list files.

[Petri Latvala]

IGT testing in Intel's CI is using a static list of tests to
run. Commenting out tests and annotating them will help
human-readability.

Signed-off-by: Petri Latvala 
---

Possible duplicate, I didn't see this arrive on the mailing list myself

framework/programs/run.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/framework/programs/run.py b/framework/programs/run.py
index ecfc36f..7921816 100644
--- a/framework/programs/run.py
+++ b/framework/programs/run.py
@@ -325,8 +325,9 @@ def run(input_):
 # If a test list is provided then set the forced_test_list value.
 if args.test_list:
 with open(args.test_list) as test_list:
-# Strip newlines
-profile.forced_test_list = list([t.strip() for t in test_list])
+# Strip newlines and comments, ignore empty lines
+stripped = [t.split('#')[0].strip() for t in test_list]
+profile.forced_test_list = list(filter(None, stripped))
 
 results.time_elapsed.start = time.time()
 # Set the dmesg type
-- 
2.9.3

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