[Piglit] [PATCH 2/6] Never call glutKeyboardFunc in -auto mode

[Paul Berry]

On 25 August 2012 01:12, Chris Forbes <chrisf at ijw.co.nz> wrote:

>
> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
>

Reviewed-by: Paul Berry <stereotype441 at gmail.com>


> ---
>  tests/fbo/fbo-generatemipmap-formats.c              | 3 +--
>  tests/shaders/glsl-arb-fragment-coord-conventions.c | 2 +-
>  tests/texturing/texdepth.c                          | 5 +++--
>  tests/texturing/texwrap.c                           | 4 +---
>  4 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/tests/fbo/fbo-generatemipmap-formats.c
> b/tests/fbo/fbo-generatemipmap-formats.c
> index 465adea..8089c13 100644
> --- a/tests/fbo/fbo-generatemipmap-formats.c
> +++ b/tests/fbo/fbo-generatemipmap-formats.c
> @@ -471,9 +471,8 @@ void piglit_init(int argc, char **argv)
>  {
>         fbo_formats_init(argc, argv, GL_FALSE);
>
> -       glutKeyboardFunc(key_func);
> -
>         if (!piglit_automatic) {
> +           glutKeyboardFunc(key_func);
>                 printf("    -n   Next test set.\n"
>                        "    -N   Previous test set.\n"
>                        "    -m   Next format in the set.\n"
> diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions.c
> b/tests/shaders/glsl-arb-fragment-coord-conventions.c
> index a403996..3dbb81f 100644
> --- a/tests/shaders/glsl-arb-fragment-coord-conventions.c
> +++ b/tests/shaders/glsl-arb-fragment-coord-conventions.c
> @@ -229,7 +229,7 @@ piglit_init(int argc, char **argv)
>
>     if (!piglit_automatic) {
>        printf("Press t to switch between subtests.\n");
> +         glutKeyboardFunc(key_func);
>     }
>
> -   glutKeyboardFunc(key_func);
>  }
> diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c
> index 2be7dc1..da24530 100644
> --- a/tests/texturing/texdepth.c
> +++ b/tests/texturing/texdepth.c
> @@ -383,10 +383,11 @@ piglit_init(int argc, char **argv)
>         GLfloat texbuf[4];
>
>         glutReshapeFunc(Reshape);
> -       glutKeyboardFunc(Key);
>
> -       if (!piglit_automatic)
> +       if (!piglit_automatic) {
> +               glutKeyboardFunc(Key);
>                 printf("Press 't' to cycle through test images\n");
> +    }
>
>         piglit_require_extension("GL_ARB_depth_texture");
>         HaveShadow = piglit_is_extension_supported("GL_ARB_shadow");
> diff --git a/tests/texturing/texwrap.c b/tests/texturing/texwrap.c
> index 4daf56d..2fb3d03 100644
> --- a/tests/texturing/texwrap.c
> +++ b/tests/texturing/texwrap.c
> @@ -1458,15 +1458,13 @@ void piglit_init(int argc, char **argv)
>
>      piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
>
> -    if (!piglit_automatic)
> -      glutKeyboardFunc(key_func);
> -
>      glClearColor(0.5, 0.5, 0.5, 1.0);
>
>      assert(glGetError() == 0);
>      init_textures();
>
>      if (!piglit_automatic) {
> +        glutKeyboardFunc(key_func);
>          printf("Hotkeys in the interactive mode:\n"
>                 "    b  - use 1-pixel texture border (deprecated in GL3)\n"
>                 "    p  - use projective texturing\n"
> --
> 1.7.12
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20120826/e11f203f/attachment.html>