[Piglit] [PATCH 1/5] fbo-formats: add f/F key to choose next/prev test, test set

[Brian Paul]

This lets us step through all the fbo formats with one key.
---
 tests/fbo/fbo-formats.h |   52 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/tests/fbo/fbo-formats.h b/tests/fbo/fbo-formats.h
index 88b9ab8..0c5ff93 100644
--- a/tests/fbo/fbo-formats.h
+++ b/tests/fbo/fbo-formats.h
@@ -481,29 +481,36 @@ static const struct test_desc *test_set;
 static int test_index;
 static int format_index;
 
+
+/**
+ * If inc_dec == +1, go to  the next test set.
+ * If inc_dec == -1, go to the previous test set.
+ */
+static void next_test_set(int inc_dec)
+{
+	do {
+		test_index += inc_dec;
+		if (test_index >= ARRAY_SIZE(test_sets)) {
+			test_index = 0;
+		}
+		else if (test_index < 0) {
+			test_index = ARRAY_SIZE(test_sets) - 1;
+		}
+	} while (!supported(&test_sets[test_index]));
+	format_index = 0;
+	printf("Using test set: %s\n", test_sets[test_index].param);
+}
+
+
 static void fbo_formats_key_func(unsigned char key, int x, int y)
 {
 	switch (key) {
 	case 'n': /* next test set */
-		do {
-			test_index++;
-			if (test_index >= ARRAY_SIZE(test_sets)) {
-				test_index = 0;
-			}
-		} while (!supported(&test_sets[test_index]));
-		format_index = 0;
-		printf("Using test set: %s\n", test_sets[test_index].param);
+		next_test_set(+1);
 		break;
 
 	case 'N': /* previous test set */
-		do {
-			test_index--;
-			if (test_index < 0) {
-				test_index = ARRAY_SIZE(test_sets) - 1;
-			}
-		} while (!supported(&test_sets[test_index]));
-		format_index = 0;
-		printf("Using test set: %s\n", test_sets[test_index].param);
+		next_test_set(-1);
 		break;
 
 	case 'm': /* next format */
@@ -519,6 +526,19 @@ static void fbo_formats_key_func(unsigned char key, int x, int y)
 			format_index = test_sets[test_index].num_formats - 1;
 		}
 		break;
+	case 'f': /* next format, or next test set */
+		format_index++;
+		if (format_index >= test_sets[test_index].num_formats) {
+			next_test_set(+1);
+		}
+		break;
+	case 'F': /* prev format, or prev test set */
+		format_index--;
+		if (format_index < 0) {
+			next_test_set(-1);
+			format_index = test_sets[test_index].num_formats - 1;
+		}
+		break;
 	}
 	piglit_escape_exit_key(key, x, y);
 }
-- 
1.7.3.4