diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-09-05 17:21:21 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-10-09 17:35:41 -0700 |
| commit | cc29216d873c02a5a6c6a7bb9f68139c0085b47c (patch) | |
| tree | 2710ea33d901f37c20e1b5b136709530216b35d4 /tests/texturing | |
| parent | 6ff0ee8039c6aceca1a8f9066d333f73aab1d468 (diff) | |
tests,util: Wrap glutKeyboardFunc with piglit_set_keyboard_func
I'm trying to transition Piglit from using GLUT to using Waffle. This
requires killing all uses of GLUT functions, one-by-one.
This patch replaces all-but-one instance of glutKeyboardFunc with a new
wrapper, piglit_set_keyboard_func. The one remaining test that uses
glutKeyboardFunc is windowoverlap; but that tests doesn't use
piglit-framework, anyway.
Reviewed-and-tested-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'tests/texturing')
| -rw-r--r-- | tests/texturing/lodbias.c | 2 | ||||
| -rw-r--r-- | tests/texturing/texdepth.c | 2 | ||||
| -rw-r--r-- | tests/texturing/texwrap.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c index 838c075f..9d39ab78 100644 --- a/tests/texturing/lodbias.c +++ b/tests/texturing/lodbias.c @@ -311,7 +311,7 @@ piglit_init(int argc, char **argv) "Press 'b'/'B' to change primary LOD bias\n" "Press 'n'/'N' to change secondary LOD bias\n" "Press 'Escape' to quit\n"); - glutKeyboardFunc(Key); + piglit_set_keyboard_func(Key); } glGenTextures(2, Textures); diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c index 9111b353..d6edcbca 100644 --- a/tests/texturing/texdepth.c +++ b/tests/texturing/texdepth.c @@ -374,7 +374,7 @@ piglit_init(int argc, char **argv) GLfloat texbuf[4]; if (!piglit_automatic) { - glutKeyboardFunc(Key); + piglit_set_keyboard_func(Key); printf("Press 't' to cycle through test images\n"); } diff --git a/tests/texturing/texwrap.c b/tests/texturing/texwrap.c index 8e86d521..34813d65 100644 --- a/tests/texturing/texwrap.c +++ b/tests/texturing/texwrap.c @@ -1454,7 +1454,7 @@ void piglit_init(int argc, char **argv) init_textures(); if (!piglit_automatic) { - glutKeyboardFunc(key_func); + piglit_set_keyboard_func(key_func); printf("Hotkeys in the interactive mode:\n" " b - use 1-pixel texture border (deprecated in GL3)\n" " p - use projective texturing\n" |