[Piglit] [PATCH 3/6] Flip the expected result for 'GLSL link matched global initializer expression'
Ian Romanick
idr at freedesktop.org
Fri Oct 28 15:26:54 PDT 2011
From: Ian Romanick <ian.d.romanick at intel.com>
This test, formerly known as glsl-link-initializer-05, used to verify
that two shaders that initialized a global variable with the same
non-constant expression would succeed linking. However, this did not
match the behavior of at least one other major vendor. In addition,
the language about initializers changed in GLSL 4.20.
"If a shared global has multiple initializers, the initializers
must all be constant expressions, and they must all have the same
value. Otherwise, a link error will result. (A shared global
having only one initializer does not require that initializer to
be a constant expression.)"
The test now expects the GLSL 4.20 behavior.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
tests/all.tests | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tests/all.tests b/tests/all.tests
index 8f50306..3c19de1 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -469,7 +469,7 @@ shaders['GLSL link mismatched global initializer, 3 shaders'] = concurrent_test(
shaders['GLSL link mismatched global const initializer'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-02a.vert shaders/glsl-link-initializer-02b.vert fail')
shaders['GLSL link matched global initializer'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-04a.vert shaders/glsl-link-initializer-04b.vert pass')
shaders['GLSL link two programs, global initializer'] = concurrent_test('glsl-link-initializer-03')
-shaders['GLSL link matched global initializer expression'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-05a.vert shaders/glsl-link-initializer-05b.vert pass')
+shaders['GLSL link matched global initializer expression'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-05a.vert shaders/glsl-link-initializer-05b.vert fail')
shaders['GLSL link mismatched global initializer expression'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-06a.vert shaders/glsl-link-initializer-06b.vert fail')
shaders['GLSL link mismatched invariant'] = concurrent_test('glsl-link-test shaders/glsl-link-invariant-01a.vert shaders/glsl-link-invariant-01b.vert fail')
shaders['GLSL link mismatched centroid'] = concurrent_test('glsl-link-test shaders/glsl-link-centroid-01a.vert shaders/glsl-link-centroid-01b.vert fail')
--
1.7.6.4
More information about the Piglit
mailing list