[Piglit] [PATCH] Replace more if(piglit_get_gl_version() < N)...

Brian Paul brianp at vmware.com
Thu Oct 4 07:09:53 PDT 2012


On 10/01/2012 02:36 PM, Chris Forbes wrote:
> These cases were missed by the original semantic patch due to using
> fprintf(stderr,... instead of printf.
>
> Signed-off-by: Chris Forbes<chrisf at ijw.co.nz>
> ---
>   tests/spec/arb_transform_feedback2/draw-auto.c  | 5 +----
>   tests/spec/ext_transform_feedback/interleaved.c | 5 +----
>   tests/spec/ext_transform_feedback/output-type.c | 5 +----
>   tests/spec/ext_transform_feedback/position.c    | 5 +----
>   tests/spec/ext_transform_feedback/separate.c    | 5 +----
>   5 files changed, 5 insertions(+), 20 deletions(-)
>
> diff --git a/tests/spec/arb_transform_feedback2/draw-auto.c b/tests/spec/arb_transform_feedback2/draw-auto.c
> index 01780a9..1ebed2e 100644
> --- a/tests/spec/arb_transform_feedback2/draw-auto.c
> +++ b/tests/spec/arb_transform_feedback2/draw-auto.c
> @@ -71,10 +71,7 @@ void piglit_init(int argc, char **argv)
>   	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
>
>   	/* Check the driver. */
> -	if (piglit_get_gl_version()<  15) {
> -		fprintf(stderr, "OpenGL 1.5 required.\n");
> -		piglit_report_result(PIGLIT_SKIP);
> -	}
> +	piglit_require_gl_version(15);
>   	piglit_require_GLSL();
>   	piglit_require_extension("GL_EXT_transform_feedback");
>   	piglit_require_extension("GL_ARB_transform_feedback2");
> diff --git a/tests/spec/ext_transform_feedback/interleaved.c b/tests/spec/ext_transform_feedback/interleaved.c
> index 836da16..6c0e256 100644
> --- a/tests/spec/ext_transform_feedback/interleaved.c
> +++ b/tests/spec/ext_transform_feedback/interleaved.c
> @@ -62,10 +62,7 @@ void piglit_init(int argc, char **argv)
>   	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
>
>   	/* Check the driver. */
> -	if (piglit_get_gl_version()<  15) {
> -		fprintf(stderr, "OpenGL 1.5 required.\n");
> -		piglit_report_result(PIGLIT_SKIP);
> -	}
> +	piglit_require_gl_version(15);
>   	piglit_require_GLSL();
>   	piglit_require_transform_feedback();
>
> diff --git a/tests/spec/ext_transform_feedback/output-type.c b/tests/spec/ext_transform_feedback/output-type.c
> index 0777cd2..e6e89d8 100644
> --- a/tests/spec/ext_transform_feedback/output-type.c
> +++ b/tests/spec/ext_transform_feedback/output-type.c
> @@ -1470,10 +1470,7 @@ test_ready:
>   	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
>
>   	/* Check the driver. */
> -	if (piglit_get_gl_version()<  15) {
> -		fprintf(stderr, "OpenGL 1.5 required.\n");
> -		piglit_report_result(PIGLIT_SKIP);
> -	}
> +	piglit_require_gl_version(15);
>   	piglit_require_GLSL();
>   	piglit_require_transform_feedback();
>   	if (!test->is_floating_point)
> diff --git a/tests/spec/ext_transform_feedback/position.c b/tests/spec/ext_transform_feedback/position.c
> index 3a52058..57a9d67 100644
> --- a/tests/spec/ext_transform_feedback/position.c
> +++ b/tests/spec/ext_transform_feedback/position.c
> @@ -100,10 +100,7 @@ void piglit_init(int argc, char **argv)
>   	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
>
>   	/* Check the driver. */
> -	if (piglit_get_gl_version()<  15) {
> -		fprintf(stderr, "OpenGL 1.5 required.\n");
> -		piglit_report_result(PIGLIT_SKIP);
> -	}
> +	piglit_require_gl_version(15);
>   	piglit_require_GLSL();
>   	piglit_require_transform_feedback();
>
> diff --git a/tests/spec/ext_transform_feedback/separate.c b/tests/spec/ext_transform_feedback/separate.c
> index 6451e81..fe7dba5 100644
> --- a/tests/spec/ext_transform_feedback/separate.c
> +++ b/tests/spec/ext_transform_feedback/separate.c
> @@ -62,10 +62,7 @@ void piglit_init(int argc, char **argv)
>   	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
>
>   	/* Check the driver. */
> -	if (piglit_get_gl_version()<  15) {
> -		fprintf(stderr, "OpenGL 1.5 required.\n");
> -		piglit_report_result(PIGLIT_SKIP);
> -	}
> +	piglit_require_gl_version(15);
>   	piglit_require_GLSL();
>   	piglit_require_transform_feedback();
>

Reviewed-by: Brian Paul <brianp at vmware.com>


More information about the Piglit mailing list