[Piglit] [PATCH 04/13] util/gl: Rename struct piglit_gl_subtest -> piglit_subtest

[Chad Versace]

This prepares for using Piglit's subtest magic in non-GL tests.

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/spec/arb_compute_shader/api_errors.c |  2 +-
 tests/util/piglit-framework-gl.c           | 10 +++++-----
 tests/util/piglit-framework-gl.h           | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/spec/arb_compute_shader/api_errors.c b/tests/spec/arb_compute_shader/api_errors.c
index e069750..fbc0121 100644
--- a/tests/spec/arb_compute_shader/api_errors.c
+++ b/tests/spec/arb_compute_shader/api_errors.c
@@ -162,7 +162,7 @@ query_work_group_size_no_compute(void *data)
 }
 
 
-static const struct piglit_gl_subtest subtests[] = {
+static const struct piglit_subtest subtests[] = {
 	{
 		"Query COMPUTE_WORK_GROUP_SIZE on unlinked program",
 		"query-work-group-size-unlinked",
diff --git a/tests/util/piglit-framework-gl.c b/tests/util/piglit-framework-gl.c
index beaa829..cc21b16 100644
--- a/tests/util/piglit-framework-gl.c
+++ b/tests/util/piglit-framework-gl.c
@@ -61,7 +61,7 @@ delete_arg(char *argv[], int argc, int arg)
 
 static void
 piglit_parse_subtest_args(int *argc, char *argv[],
-			  const struct piglit_gl_subtest *subtests,
+			  const struct piglit_subtest *subtests,
 			  const char ***out_selected_subtests,
 			  size_t *out_num_selected_subtests)
 {
@@ -274,8 +274,8 @@ piglit_destroy_dma_buf(struct piglit_dma_buf *buf)
 		gl_fw->destroy_dma_buf(buf);
 }
 
-const struct piglit_gl_subtest *
-piglit_find_subtest(const struct piglit_gl_subtest *subtests, const char *name)
+const struct piglit_subtest *
+piglit_find_subtest(const struct piglit_subtest *subtests, const char *name)
 {
 	unsigned i;
 
@@ -288,7 +288,7 @@ piglit_find_subtest(const struct piglit_gl_subtest *subtests, const char *name)
 }
 
 enum piglit_result
-piglit_run_selected_subtests(const struct piglit_gl_subtest *all_subtests,
+piglit_run_selected_subtests(const struct piglit_subtest *all_subtests,
 			     const char **selected_subtests,
 			     size_t num_selected_subtests,
 			     enum piglit_result previous_result)
@@ -301,7 +301,7 @@ piglit_run_selected_subtests(const struct piglit_gl_subtest *all_subtests,
 		for (i = 0; i < num_selected_subtests; i++) {
 			enum piglit_result subtest_result;
 			const char *const name = selected_subtests[i];
-			const struct piglit_gl_subtest *subtest =
+			const struct piglit_subtest *subtest =
 				piglit_find_subtest(all_subtests, name);
 
 			if (subtest == NULL) {
diff --git a/tests/util/piglit-framework-gl.h b/tests/util/piglit-framework-gl.h
index d8485b3..07a64aa 100644
--- a/tests/util/piglit-framework-gl.h
+++ b/tests/util/piglit-framework-gl.h
@@ -45,7 +45,7 @@ enum piglit_gl_visual {
 /**
  * An idividual subtest that makes up part of a test group.
  */
-struct piglit_gl_subtest {
+struct piglit_subtest {
 	/** Name of the subtest as it will appear in the log. */
 	const char *name;
 
@@ -60,7 +60,7 @@ struct piglit_gl_subtest {
 };
 
 /**
- * Detect the end of an array of piglit_gl_subtest structures
+ * Detect the end of an array of piglit_subtest structures
  *
  * The array of subtests is terminated by structure with a \c NULL \c
  * name pointer.
@@ -217,7 +217,7 @@ struct piglit_gl_test_config {
 	 * This is only used during command line argument parsing to implement
 	 * the -list-subtests option.
 	 */
-	const struct piglit_gl_subtest *subtests;
+	const struct piglit_subtest *subtests;
 
 	/**
 	 * Names of subtests supplied on the command line.
@@ -358,11 +358,11 @@ piglit_create_dma_buf(unsigned w, unsigned h, unsigned cpp,
 void
 piglit_destroy_dma_buf(struct piglit_dma_buf *buf);
 
-const struct piglit_gl_subtest *
-piglit_find_subtest(const struct piglit_gl_subtest *subtests, const char *name);
+const struct piglit_subtest *
+piglit_find_subtest(const struct piglit_subtest *subtests, const char *name);
 
 enum piglit_result
-piglit_run_selected_subtests(const struct piglit_gl_subtest *all_subtests,
+piglit_run_selected_subtests(const struct piglit_subtest *all_subtests,
 			     const char **selected_subtests,
 			     size_t num_selected_subtests,
 			     enum piglit_result previous_result);
-- 
1.8.5.3