diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2016-05-05 17:15:22 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2016-06-17 14:24:59 -0700 |
| commit | 00ad3b38bcdd95b218cd0e17cea4661b36e08c92 (patch) | |
| tree | 46c40b5fa267c7ed7bb27e865d5a0673329c63ad | |
| parent | 732694d0aa6695f26d9fa6f5f133a6a61af1410a (diff) | |
shaders: port "GLSL link mismatched global initializer expression" to shader_test
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | tests/all.py | 5 | ||||
| -rw-r--r-- | tests/shaders/glsl-link-initializer-06a.vert | 8 | ||||
| -rw-r--r-- | tests/shaders/glsl-link-initializer-06b.vert | 10 | ||||
| -rw-r--r-- | tests/spec/glsl-1.10/linker/global-initializer-unmatched-expression.shader_test | 27 |
4 files changed, 27 insertions, 23 deletions
diff --git a/tests/all.py b/tests/all.py index 7c9801d95..8c3fc559f 100644 --- a/tests/all.py +++ b/tests/all.py @@ -596,11 +596,6 @@ with profile.group_manager(PiglitGLTest, 'shaders') as g: g(['glsl-link-initializer-03'], 'GLSL link two programs, global initializer') g(['glsl-link-test', - os.path.join('shaders', 'glsl-link-initializer-06a.vert'), - os.path.join('shaders', 'glsl-link-initializer-06b.vert'), - 'fail'], - 'GLSL link mismatched global initializer expression') - g(['glsl-link-test', os.path.join('shaders', 'glsl-link-invariant-01a.vert'), os.path.join('shaders', 'glsl-link-invariant-01b.vert'), 'fail'], diff --git a/tests/shaders/glsl-link-initializer-06a.vert b/tests/shaders/glsl-link-initializer-06a.vert deleted file mode 100644 index f794e2467..000000000 --- a/tests/shaders/glsl-link-initializer-06a.vert +++ /dev/null @@ -1,8 +0,0 @@ -uniform float angle; -uniform float scale; -float global_variable = cos(angle) * scale; - -float function(void) -{ - return global_variable; -}
\ No newline at end of file diff --git a/tests/shaders/glsl-link-initializer-06b.vert b/tests/shaders/glsl-link-initializer-06b.vert deleted file mode 100644 index 330e343b1..000000000 --- a/tests/shaders/glsl-link-initializer-06b.vert +++ /dev/null @@ -1,10 +0,0 @@ -uniform float angle; -uniform float scale; -float global_variable = scale * sin(angle); - -float function(void); - -void main() -{ - gl_Position = gl_Vertex * global_variable * function(); -} diff --git a/tests/spec/glsl-1.10/linker/global-initializer-unmatched-expression.shader_test b/tests/spec/glsl-1.10/linker/global-initializer-unmatched-expression.shader_test new file mode 100644 index 000000000..6c5940e48 --- /dev/null +++ b/tests/spec/glsl-1.10/linker/global-initializer-unmatched-expression.shader_test @@ -0,0 +1,27 @@ +[require] +GLSL >= 1.10 + +[vertex shader] +uniform float angle; +uniform float scale; +float global_variable = cos(angle) * scale; + +float function(void) +{ + return global_variable; +} + +[vertex shader] +uniform float angle; +uniform float scale; +float global_variable = scale * sin(angle); + +float function(void); + +void main() +{ + gl_Position = gl_Vertex * global_variable * function(); +} + +[test] +link error |