[Piglit] [PATCH 3/3] Make shader_runner require [require] and GLSL version requirement.

[Tom Gall]

There's one thing that kinda bothers me about this patch. A good
number of these tests are quite reusable between glsl and glsl es for
instance.

I've gone through a bit of work already to get ~400 to work for glsl
es with the goal of getting these back into piglit in some form. So
the question is, do I aim for commonality or should we just be
resigned that glsl and glsl es shader tests will be separate due to
the the require section can't specify both and if glsl es is
specified, gl es has to be specified too?

If there is consensus that shader tests will be separate between glsl
and glsl es then sure these patches look good.

Reviewed-by: Tom Gall <tom.gall at linaro.org>

On Thu, Jan 31, 2013 at 12:17 PM, Stuart Abercrombie
<sabercrombie at chromium.org> wrote:
> Another step towards removing explicit #version directives.
>
> Signed-off-by: Stuart Abercrombie <sabercrombie at chromium.org>
> ---
>  tests/shaders/shader_runner.c |   12 +++++++++++-
>  1 files changed, 11 insertions(+), 1 deletions(-)
>
> diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
> index d83228e..215e217 100644
> --- a/tests/shaders/shader_runner.c
> +++ b/tests/shaders/shader_runner.c
> @@ -914,8 +914,18 @@ 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->found_glsl && results->glsl_version.es && !results->found_gl) {
> +       if (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);
> --
> 1.7.5.4
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit



-- 
Regards,
Tom

"Where's the kaboom!? There was supposed to be an earth-shattering
kaboom!" Marvin Martian
Tech Lead, Graphics Working Group | Linaro.org │ Open source software
for ARM SoCs
w) tom.gall att linaro.org
h) tom_gall att mac.com