diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-12-11 18:06:52 -0600 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-12-12 13:57:37 -0600 |
| commit | 1e6cc6f6475e4add9c7c3b65ab4de2e1a1f55e31 (patch) | |
| tree | 4b50b0b973a64f83590b542985e9f5594c2e0dd8 /framework | |
| parent | fabdbca202d0a275c18485b5ab80f6253ef37fc9 (diff) | |
framework/shader_test: Assume the api is GL if no requirements are found
Commit 260f211 caused some shader tests to regress with the message:
"Failed to find [require] block".
This patch changes the python script that drives shader_runner to assume
that the test's API is GL if no GL requirement is found in the test file.
This behavior matches the behavior of the shader_runner executable, whose
default requirements are GL >= 1.0 and GLSL >= 1.10.
I tested this patch with a full Piglit run. The delta against
master-ed3903c consists only of fixes.
Reviewed-by: Tom Gall <tom.gall@linaro.org>
Tested-by: Tom Gall <tom.gall@linaro.org>
Reported-by: Ian Romanick <idr@freedesktop.org>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'framework')
| -rwxr-xr-x | framework/shader_test.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/framework/shader_test.py b/framework/shader_test.py index a587f371..ea637cf6 100755 --- a/framework/shader_test.py +++ b/framework/shader_test.py @@ -196,13 +196,13 @@ class ShaderTest(PlainExecTest): else: assert(False) - # Failed to parse the GL requirement. - self.__gl_api = ShaderTest.API_ERROR - - if parse_state == PARSE_FIND_REQUIRE_HEADER: - self.__report_failure("Failed to find [require] block") - elif parse_state == PARSE_FIND_GL_REQUIREMENT: - self.__report_failure("Failed to find end of [require] block") + if parse_state == PARSE_FIND_REQUIRE_HEADER or \ + parse_state == PARSE_FIND_GL_REQUIREMENT: + # If no requirements are found, then assume the required + # API is GL. This matches the behavior of the + # shader_runner executable, whose default requirements are + # GL >= 1.0 and GLSL >= 1.10. + self.__gl_api = ShaderTest.API_GL else: assert(False) |