On 25 August 2012 01:12, Chris Forbes <span dir="ltr"><<a href="mailto:chrisf@ijw.co.nz" target="_blank">chrisf@ijw.co.nz</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Signed-off-by: Chris Forbes <<a href="mailto:chrisf@ijw.co.nz">chrisf@ijw.co.nz</a>><br></blockquote><div><br>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br>
</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
tests/fbo/fbo-generatemipmap-formats.c | 3 +--<br>
tests/shaders/glsl-arb-fragment-coord-conventions.c | 2 +-<br>
tests/texturing/texdepth.c | 5 +++--<br>
tests/texturing/texwrap.c | 4 +---<br>
4 files changed, 6 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/tests/fbo/fbo-generatemipmap-formats.c b/tests/fbo/fbo-generatemipmap-formats.c<br>
index 465adea..8089c13 100644<br>
--- a/tests/fbo/fbo-generatemipmap-formats.c<br>
+++ b/tests/fbo/fbo-generatemipmap-formats.c<br>
@@ -471,9 +471,8 @@ void piglit_init(int argc, char **argv)<br>
{<br>
fbo_formats_init(argc, argv, GL_FALSE);<br>
<br>
- glutKeyboardFunc(key_func);<br>
-<br>
if (!piglit_automatic) {<br>
+ glutKeyboardFunc(key_func);<br>
printf(" -n Next test set.\n"<br>
" -N Previous test set.\n"<br>
" -m Next format in the set.\n"<br>
diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions.c b/tests/shaders/glsl-arb-fragment-coord-conventions.c<br>
index a403996..3dbb81f 100644<br>
--- a/tests/shaders/glsl-arb-fragment-coord-conventions.c<br>
+++ b/tests/shaders/glsl-arb-fragment-coord-conventions.c<br>
@@ -229,7 +229,7 @@ piglit_init(int argc, char **argv)<br>
<br>
if (!piglit_automatic) {<br>
printf("Press t to switch between subtests.\n");<br>
+ glutKeyboardFunc(key_func);<br>
}<br>
<br>
- glutKeyboardFunc(key_func);<br>
}<br>
diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c<br>
index 2be7dc1..da24530 100644<br>
--- a/tests/texturing/texdepth.c<br>
+++ b/tests/texturing/texdepth.c<br>
@@ -383,10 +383,11 @@ piglit_init(int argc, char **argv)<br>
GLfloat texbuf[4];<br>
<br>
glutReshapeFunc(Reshape);<br>
- glutKeyboardFunc(Key);<br>
<br>
- if (!piglit_automatic)<br>
+ if (!piglit_automatic) {<br>
+ glutKeyboardFunc(Key);<br>
printf("Press 't' to cycle through test images\n");<br>
+ }<br>
<br>
piglit_require_extension("GL_ARB_depth_texture");<br>
HaveShadow = piglit_is_extension_supported("GL_ARB_shadow");<br>
diff --git a/tests/texturing/texwrap.c b/tests/texturing/texwrap.c<br>
index 4daf56d..2fb3d03 100644<br>
--- a/tests/texturing/texwrap.c<br>
+++ b/tests/texturing/texwrap.c<br>
@@ -1458,15 +1458,13 @@ void piglit_init(int argc, char **argv)<br>
<br>
piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);<br>
<br>
- if (!piglit_automatic)<br>
- glutKeyboardFunc(key_func);<br>
-<br>
glClearColor(0.5, 0.5, 0.5, 1.0);<br>
<br>
assert(glGetError() == 0);<br>
init_textures();<br>
<br>
if (!piglit_automatic) {<br>
+ glutKeyboardFunc(key_func);<br>
printf("Hotkeys in the interactive mode:\n"<br>
" b - use 1-pixel texture border (deprecated in GL3)\n"<br>
" p - use projective texturing\n"<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.12<br>
<br>
_______________________________________________<br>
Piglit mailing list<br>
<a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a><br>
</font></span></blockquote></div><br>