[Piglit] [PATCH 3/3] Make shader_runner require [require] and GLSL version requirement.

Stuart Abercrombie sabercrombie at chromium.org
Thu Jan 31 10:17:25 PST 2013


Another step towards removing explicit #version directives.

Signed-off-by: Stuart Abercrombie <sabercrombie at chromium.org>
---
 tests/shaders/shader_runner.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index d83228e..215e217 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -914,8 +914,18 @@ parse_required_versions(struct requirement_parse_results *results,
 	}
 
 	free(text);
+	
+	if (!in_requirement_section) {
+		printf("[require] section missing\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	if (!results->found_glsl) {
+		printf("GLSL version requirement missing\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
 
-	if (results->found_glsl && results->glsl_version.es && !results->found_gl) {
+	if (results->glsl_version.es && !results->found_gl) {
 		printf("%s", "The test specifies a requirement for GLSL ES, "
 		       "but specifies no GL requirement\n.");
 		piglit_report_result(PIGLIT_FAIL);
-- 
1.7.5.4



More information about the Piglit mailing list