[Piglit] [PATCH] Revert "shader_runner: Require [require] and GLSL version requirement."

Chad Versace chad.versace at linux.intel.com
Wed Feb 6 14:52:56 PST 2013


Do it.

On 02/06/2013 02:50 PM, Eric Anholt wrote:
> This reverts commit de1d4aa0f2f2d14cd0fd04dec593bf151dcbad8a.
> The commit broke the ARB_fragment_program texturing tests.
> ---
>  tests/shaders/shader_runner.c |   12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
> index 84d7c45..d83228e 100644
> --- a/tests/shaders/shader_runner.c
> +++ b/tests/shaders/shader_runner.c
> @@ -915,17 +915,7 @@ parse_required_versions(struct requirement_parse_results *results,
>  
>  	free(text);
>  
> -	if (!in_requirement_section) {
> -		printf("[require] section missing\n");
> -		piglit_report_result(PIGLIT_FAIL);
> -	}
> -
> -	if (!results->found_glsl) {
> -		printf("GLSL version requirement missing\n");
> -		piglit_report_result(PIGLIT_FAIL);
> -	}
> -
> -	if (results->glsl_version.es && !results->found_gl) {
> +	if (results->found_glsl && results->glsl_version.es && !results->found_gl) {
>  		printf("%s", "The test specifies a requirement for GLSL ES, "
>  		       "but specifies no GL requirement\n.");
>  		piglit_report_result(PIGLIT_FAIL);
> 



More information about the Piglit mailing list