[Piglit] [PATCH 4/4] fbo-integer: Reuse piglit_require_GLSL_version().

Ian Romanick idr at freedesktop.org
Wed May 29 14:25:05 PDT 2013


Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 05/29/2013 10:59 AM, Eric Anholt wrote:
> ---
>   tests/fbo/fbo-integer.c | 10 +---------
>   1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/tests/fbo/fbo-integer.c b/tests/fbo/fbo-integer.c
> index dec14e9..63ed52a 100644
> --- a/tests/fbo/fbo-integer.c
> +++ b/tests/fbo/fbo-integer.c
> @@ -398,19 +398,11 @@ piglit_display(void)
>   void
>   piglit_init(int argc, char **argv)
>   {
> -   bool es;
> -   int glslMajor, glslMinor;
> -
>      piglit_require_extension("GL_ARB_framebuffer_object");
>      piglit_require_extension("GL_EXT_texture_integer");
>      piglit_require_extension("GL_EXT_gpu_shader4");
>
> -   piglit_get_glsl_version(&es, &glslMajor, &glslMinor);
> -   if (glslMajor * 100 + glslMinor < 130) {
> -      printf("%s requires GLSL 1.30 or later\n", TestName);
> -      piglit_report_result(PIGLIT_SKIP);
> -      return;
> -   }
> +   piglit_require_GLSL_version(130);
>
>      PassthroughFragShader = piglit_compile_shader_text(GL_FRAGMENT_SHADER,
>                                                         PassthroughFragShaderText);
>



More information about the Piglit mailing list