Re: [Piglit] [PATCH] arb_shading_language_420pack: Make compatible with 4.30.

[Pohjolainen, Topi]

On Mon, Jun 06, 2016 at 02:40:15PM -0700, Matt Turner wrote:
> 4.30 removes gl_FragColor. In debugging bug 96320, I found it useful to
> replace gl_FragColor with a user-defined varying so that the tests could
> be run under GLSL 4.30.

Reviewed-by: Topi Pohjolainen 
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH] arb_shading_language_420pack: Make compatible with 4.30.

[Matt Turner]

4.30 removes gl_FragColor. In debugging bug 96320, I found it useful to
replace gl_FragColor with a user-defined varying so that the tests could
be run under GLSL 4.30.
---
 .../execution/aggregate-dynamic-initializer-matrix.shader_test  | 3 ++-
 .../execution/aggregate-dynamic-initializer-sized-array.shader_test | 3 ++-
 .../execution/aggregate-dynamic-initializer-struct.shader_test  | 3 ++-
 .../aggregate-dynamic-initializer-unsized-array.shader_test | 3 ++-
 .../execution/aggregate-initializer-matrix.shader_test  | 3 ++-
 .../execution/aggregate-initializer-sized-array.shader_test | 3 ++-
 .../execution/aggregate-initializer-struct.shader_test  | 3 ++-
 .../execution/aggregate-initializer-unsized-array.shader_test   | 3 ++-
 .../execution/const-var-non-constant-expr.shader_test   | 3 ++-
 .../execution/implicit-return-type-conversion.shader_test   | 4 +++-
 .../execution/length-matrix.shader_test | 6 --
 .../execution/length-vector.shader_test | 6 --
 .../execution/scalar-swizzle.shader_test| 4 +++-
 13 files changed, 32 insertions(+), 15 deletions(-)

diff --git 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-matrix.shader_test
 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-matrix.shader_test
index 7b923e8..478767e 100644
--- 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-matrix.shader_test
+++ 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-matrix.shader_test
@@ -44,9 +44,10 @@ void main()
 
 [fragment shader]
 in vec4 color;
+out vec4 frag_color;
 
 void main() {
-gl_FragColor = color;;
+frag_color = color;
 }
 
 [test]
diff --git 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-sized-array.shader_test
 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-sized-array.shader_test
index 8191ceb..deb9bbd 100644
--- 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-sized-array.shader_test
+++ 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-sized-array.shader_test
@@ -51,9 +51,10 @@ void main()
 
 [fragment shader]
 in vec4 color;
+out vec4 frag_color;
 
 void main() {
-gl_FragColor = color;;
+frag_color = color;
 }
 
 [test]
diff --git 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-struct.shader_test
 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-struct.shader_test
index a04a2fa..0fce9c6 100644
--- 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-struct.shader_test
+++ 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-struct.shader_test
@@ -73,9 +73,10 @@ void main()
 
 [fragment shader]
 in vec4 color;
+out vec4 frag_color;
 
 void main() {
-gl_FragColor = color;;
+frag_color = color;
 }
 
 [test]
diff --git 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-unsized-array.shader_test
 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-unsized-array.shader_test
index 5300f49..8f6d5c1 100644
--- 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-unsized-array.shader_test
+++ 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-dynamic-initializer-unsized-array.shader_test
@@ -53,9 +53,10 @@ void main()
 
 [fragment shader]
 in vec4 color;
+out vec4 frag_color;
 
 void main() {
-gl_FragColor = color;;
+frag_color = color;
 }
 
 [test]
diff --git 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-matrix.shader_test
 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-matrix.shader_test
index f5da4c9..bb6a543 100644
--- 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-matrix.shader_test
+++ 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-matrix.shader_test
@@ -39,9 +39,10 @@ void main()
 
 [fragment shader]
 in vec4 color;
+out vec4 frag_color;
 
 void main() {
-gl_FragColor = color;;
+frag_color = color;
 }
 
 [test]
diff --git 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-sized-array.shader_test
 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-sized-array.shader_test
index 5ac422d..df28262 100644
--- 
a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-sized-array.shader_test
+++ 
b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-sized-array.shader_test
@@ -47,9 +47,10 @@ void main()
 
 [fragment shader]
 in vec4 color;
+out vec4 frag_color;
 
 void main() {
-gl_FragColor = color;;
+frag_c