diff options
| author | Stuart Abercrombie <sabercrombie@chromium.org> | 2013-01-15 19:25:35 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2013-01-16 12:54:28 -0800 |
| commit | dadf56dad25730556e36e9446aabfc80458cc12f (patch) | |
| tree | 6532a8563b0500cbff4a57c704833c53a0ae0e9e /tests/spec/glsl-es-1.00 | |
| parent | 321c0f467179b8e410d8b74d3805f900045f487d (diff) | |
shader_runner: Alter GL/GLSL ES version requirement syntax.
The current syntax isn't compatible with the same shader_test
supporting GL and GLES in the future.
Modify existing GL ES tests to use the new syntax, and remove
explicit #version directives, which will instead be inserted based on
GLSL >= requirements.
v2 Added check for trailing chars. Formatting.
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Tom Gall <tom.gall@linaro.org>
Diffstat (limited to 'tests/spec/glsl-es-1.00')
| -rw-r--r-- | tests/spec/glsl-es-1.00/execution/sanity.shader_test | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/spec/glsl-es-1.00/execution/sanity.shader_test b/tests/spec/glsl-es-1.00/execution/sanity.shader_test index a1dc07a0..0884e2c6 100644 --- a/tests/spec/glsl-es-1.00/execution/sanity.shader_test +++ b/tests/spec/glsl-es-1.00/execution/sanity.shader_test @@ -1,11 +1,10 @@ # Fill the window with red, then green, then blue. [require] -GL >= 2.0 es +GL ES >= 2.0 +GLSL ES >= 1.00 [vertex shader] -#version 100 - attribute vec4 vertex; void main() { @@ -13,8 +12,6 @@ void main() { } [fragment shader] -#version 100 - uniform vec4 u_color; void main() { |