[Piglit] [PATCH v2] arb_program_interface_query: fix getprogramresourceiv errors

[Francisco Jerez]

Tapani Pälli <tapani.palli at intel.com> writes:

> Move IS_PER_PATCH as part of tessellation queries, require
> GL_ARB_compute_shader for compute shader enum queries.
>
> Strictly speaking, spec would allow to query GL_REFERENCED_BY_COMPUTE_SHADER
> without having compute shaders but as it disallows GL_COMPUTE_SUBROUTINE and
> GL_COMPUTE_SUBROUTINE_UNIFORM if there is no compute shader support, it is
> likely that this is a bug in the spec.
>
> v2: add missing parenthesis! (spotted by Curro)
>
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91608
> ---
>  tests/spec/arb_program_interface_query/getprogramresourceiv.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/tests/spec/arb_program_interface_query/getprogramresourceiv.c b/tests/spec/arb_program_interface_query/getprogramresourceiv.c
> index 03f2fc6..769e29f 100755
> --- a/tests/spec/arb_program_interface_query/getprogramresourceiv.c
> +++ b/tests/spec/arb_program_interface_query/getprogramresourceiv.c
> @@ -571,16 +571,15 @@ check_extensions_prop(GLenum prop)
>  	}
>  
>  	if ((prop == GL_REFERENCED_BY_TESS_CONTROL_SHADER ||
> -	     prop == GL_REFERENCED_BY_TESS_EVALUATION_SHADER) &&
> +	     prop == GL_REFERENCED_BY_TESS_EVALUATION_SHADER ||
> +             prop == GL_IS_PER_PATCH) &&
>  	     !piglit_is_extension_supported("GL_ARB_tessellation_shader")) {
>  		 return false;
>  	}
>  
>  	if ((prop == GL_REFERENCED_BY_COMPUTE_SHADER ||
> -	     prop == GL_COMPUTE_SUBROUTINE_UNIFORM ||
> -	     prop == GL_IS_PER_PATCH) &&
> -	     !piglit_is_extension_supported("GL_ARB_compute_shader") &&
> -	     !piglit_is_extension_supported("GL_ARB_shader_image_load_store")) {
> +	     prop == GL_COMPUTE_SUBROUTINE_UNIFORM) &&
> +	     !piglit_is_extension_supported("GL_ARB_compute_shader")) {
>  		 return false;
>  	}
>  
Thanks,
Reviewed-by: Francisco Jerez <currojerez at riseup.net>

> -- 
> 2.1.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 212 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20150812/820c0c4b/attachment.sig>