[Piglit] [PATCH] shader_test.py: Check for GL ES 3.1 as well

Dylan Baker dylan at pnwbakers.com
Tue Aug 9 18:45:55 UTC 2016


Quoting Michel Dänzer (2016-08-09 00:27:41)
> From: Michel Dänzer <michel.daenzer at amd.com>
> 
> Fixes piglit runs failing with
> 
> Fatal Error: In File .../piglit/tests/spec/oes_geometry_shader/sso_validation/user-defined-gs-input-in-block.shader_test: No GL ES version set
> 
> Fixes: 25ef19627966 ("OES_geometry_shader: Basic SSO IO validation tests")
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
> ---
> 
> Consider this a report of the problem. Since I don't have push access to
> piglit, feel free to push this change or any alternative fix.
> 
>  framework/test/shader_test.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/framework/test/shader_test.py b/framework/test/shader_test.py
> index f3c945c..f0e4ccd 100644
> --- a/framework/test/shader_test.py
> +++ b/framework/test/shader_test.py
> @@ -90,7 +90,7 @@ class ShaderTest(FastSkipMixin, PiglitBaseTest):
>          for line in lines:
>              line = line.strip()
>              if line.startswith('GL ES'):
> -                if line.endswith('3.0'):
> +                if line.endswith('3.0') or line.endswith('3.1'):
>                      prog = 'shader_runner_gles3'
>                  elif line.endswith('2.0'):
>                      prog = 'shader_runner_gles2'
> -- 
> 2.8.1
> 
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit

Hi Michel,

I sent out a patch to fix this yesterday (and hopefully once and for all
since mine should also fix GLES 3.2)

It's titled: "framework: fix binary assignment for shader_runner"

Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/piglit/attachments/20160809/e205ea16/attachment-0001.sig>


More information about the Piglit mailing list