7 files changed, 8 insertions, 101 deletions
diff --git a/tests/shaders/fp-fragment-position.c b/tests/shaders/fp-fragment-position.c
index def0a3293..e156f7225 100644
--- a/tests/shaders/fp-fragment-position.c
+++ b/tests/shaders/fp-fragment-position.c
@@ -321,20 +321,6 @@ static void Reshape(int width, int height)
 	glLoadIdentity();
 }
 
-
-static void Key(unsigned char key, int x, int y)
-{
-	(void) x;
-	(void) y;
-	switch (key) {
-		case 27:
-			exit(0);
-			break;
-	}
-	glutPostRedisplay();
-}
-
-
 static void Init(void)
 {
 	int i, x, y;
@@ -411,7 +397,7 @@ int main(int argc, char *argv[])
 	glutInitDisplayMode(GLUT_RGBA | GLUT_ALPHA | GLUT_DOUBLE | GLUT_DEPTH);
 	glutCreateWindow(argv[0]);
 	glutReshapeFunc(Reshape);
-	glutKeyboardFunc(Key);
+	glutKeyboardFunc(piglit_escape_exit_key);
 	glutDisplayFunc(Redisplay);
 	glewInit();
 	Init();
diff --git a/tests/shaders/fp-kil.c b/tests/shaders/fp-kil.c
index d24284a84..3a8a55fea 100644
--- a/tests/shaders/fp-kil.c
+++ b/tests/shaders/fp-kil.c
@@ -288,20 +288,6 @@ static void Reshape(int width, int height)
 	glLoadIdentity();
 }
 
-
-static void Key(unsigned char key, int x, int y)
-{
-	(void) x;
-	(void) y;
-	switch (key) {
-	case 27:
-		exit(0);
-		break;
-	}
-	glutPostRedisplay();
-}
-
-
 static void Init(void)
 {
 	int i, x, y;
@@ -351,7 +337,7 @@ int main(int argc, char *argv[])
 	glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
 	glutCreateWindow(argv[0]);
 	glutReshapeFunc(Reshape);
-	glutKeyboardFunc(Key);
+	glutKeyboardFunc(piglit_escape_exit_key);
 	glutDisplayFunc(Redisplay);
 	glewInit();
 	Init();
diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c
index 1cabf8bf3..cf80a6062 100644
--- a/tests/shaders/glsl-fs-exp2.c
+++ b/tests/shaders/glsl-fs-exp2.c
@@ -78,19 +78,6 @@ display(void)
 	}
 }
 
-static void key(unsigned char key, int x, int y)
-{
-	(void) x;
-	(void) y;
-	switch (key) {
-		case 27:
-			exit(0);
-			break;
-	}
-	glutPostRedisplay();
-}
-
-
 static void init()
 {
 	GLint vs, fs;
@@ -136,7 +123,7 @@ int main(int argc, char**argv)
 	glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
 	glutInitWindowSize(WIN_WIDTH, WIN_HEIGHT);
 	glutCreateWindow("glsl-fs-exp2");
-	glutKeyboardFunc(key);
+	glutKeyboardFunc(piglit_escape_exit_key);
 	glutDisplayFunc(display);
 	glewInit();
 
diff --git a/tests/shaders/glsl-fs-log2.c b/tests/shaders/glsl-fs-log2.c
index ab96f4b83..bdb367a18 100644
--- a/tests/shaders/glsl-fs-log2.c
+++ b/tests/shaders/glsl-fs-log2.c
@@ -78,19 +78,6 @@ display(void)
 	}
 }
 
-static void key(unsigned char key, int x, int y)
-{
-	(void) x;
-	(void) y;
-	switch (key) {
-		case 27:
-			exit(0);
-			break;
-	}
-	glutPostRedisplay();
-}
-
-
 static void init()
 {
 	GLint vs, fs;
@@ -136,7 +123,7 @@ int main(int argc, char**argv)
 	glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
 	glutInitWindowSize(WIN_WIDTH, WIN_HEIGHT);
 	glutCreateWindow("glsl-fs-log2");
-	glutKeyboardFunc(key);
+	glutKeyboardFunc(piglit_escape_exit_key);
 	glutDisplayFunc(display);
 	glewInit();
 
diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c
index 781ca195e..40d4a2e3e 100644
--- a/tests/shaders/glsl-uniform-update.c
+++ b/tests/shaders/glsl-uniform-update.c
@@ -84,19 +84,6 @@ display(void)
 	}
 }
 
-static void key(unsigned char key, int x, int y)
-{
-	(void) x;
-	(void) y;
-	switch (key) {
-		case 27:
-			exit(0);
-			break;
-	}
-	glutPostRedisplay();
-}
-
-
 static void init()
 {
 	GLint vs, fs;
@@ -141,7 +128,7 @@ int main(int argc, char**argv)
 	glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
 	glutInitWindowSize(WIN_WIDTH, WIN_HEIGHT);
 	glutCreateWindow("glsl-uniform-update");
-	glutKeyboardFunc(key);
+	glutKeyboardFunc(piglit_escape_exit_key);
 	glutDisplayFunc(display);
 	glewInit();
 
diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c
index e511d55e6..0f7071bb4 100644
--- a/tests/shaders/glsl-unused-varying.c
+++ b/tests/shaders/glsl-unused-varying.c
@@ -88,19 +88,6 @@ display(void)
 	}
 }
 
-static void key(unsigned char key, int x, int y)
-{
-	(void) x;
-	(void) y;
-	switch (key) {
-		case 27:
-			exit(0);
-			break;
-	}
-	glutPostRedisplay();
-}
-
-
 static void init()
 {
 	GLint vs, fs;
@@ -147,7 +134,7 @@ int main(int argc, char**argv)
 	glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
 	glutInitWindowSize(WIN_WIDTH, WIN_HEIGHT);
 	glutCreateWindow("glsl-unused-varying");
-	glutKeyboardFunc(key);
+	glutKeyboardFunc(piglit_escape_exit_key);
 	glutDisplayFunc(display);
 	glewInit();
 
diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c
index d0260a7e5..dfd5d30b3 100644
--- a/tests/shaders/glsl-vs-loop.c
+++ b/tests/shaders/glsl-vs-loop.c
@@ -109,19 +109,6 @@ display(void)
 	}
 }
 
-static void key(unsigned char key, int x, int y)
-{
-	(void) x;
-	(void) y;
-	switch (key) {
-		case 27:
-			exit(0);
-			break;
-	}
-	glutPostRedisplay();
-}
-
-
 static void init()
 {
 	GLint vs, fs;
@@ -165,8 +152,8 @@ int main(int argc, char**argv)
 
 	glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
 	glutInitWindowSize(WIN_WIDTH, WIN_HEIGHT);
-	glutCreateWindow("glsl-uniform-update");
-	glutKeyboardFunc(key);
+	glutCreateWindow("glsl-vs-loop");
+	glutKeyboardFunc(piglit_escape_exit_key);
 	glutDisplayFunc(display);
 	glewInit();