[Piglit] [PATCH 3/6] Tidy glsl-arb-fragment-coord-conventions

Chris Forbes chrisf at ijw.co.nz
Sat Aug 25 01:12:04 PDT 2012


Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
---
 tests/shaders/glsl-arb-fragment-coord-conventions.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions.c b/tests/shaders/glsl-arb-fragment-coord-conventions.c
index 3dbb81f..fd1a683 100644
--- a/tests/shaders/glsl-arb-fragment-coord-conventions.c
+++ b/tests/shaders/glsl-arb-fragment-coord-conventions.c
@@ -217,19 +217,14 @@ static void key_func(unsigned char key, int x, int y)
    piglit_escape_exit_key(key, x, y);
 }
 
-void
-piglit_init(int argc, char **argv)
+void piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-      printf("Requires OpenGL 2.0\n");
-      piglit_report_result(PIGLIT_SKIP);
-   }
-
-   piglit_require_extension("GL_ARB_fragment_coord_conventions");
+	piglit_require_gl_version(20);
 
-   if (!piglit_automatic) {
-      printf("Press t to switch between subtests.\n");
-	  glutKeyboardFunc(key_func);
-   }
+	piglit_require_extension("GL_ARB_fragment_coord_conventions");
 
+	if (!piglit_automatic) {
+		printf("Press t to switch between subtests.\n");
+		glutKeyboardFunc(key_func);
+	}
 }
-- 
1.7.12



More information about the Piglit mailing list