summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Arceri <t_arceri@yahoo.com.au>2016-06-23 14:00:28 +1000
committerTimothy Arceri <t_arceri@yahoo.com.au>2016-06-25 14:14:51 +1000
commitf7de3f0a7ca0a04c90307c009d4cb25090db288a (patch)
treed32aea0be5099e631586b05ba345dd53d3102318
parent233c1c2e5b325bd7c8bd6aee56488b2c9e21ce41 (diff)
arb_enhanced_layouts: make component packing tests more robust
Using the same value for all components could result in false positives also its not very useful for debugging.
-rw-r--r--tests/spec/arb_enhanced_layouts/execution/component-layout/vs-attribs-array.shader_test16
-rw-r--r--tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs.shader_test6
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-attribs-array.shader_test b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-attribs-array.shader_test
index 9227a8f19..03b6acae4 100644
--- a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-attribs-array.shader_test
+++ b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-attribs-array.shader_test
@@ -33,11 +33,11 @@ void main()
}
[vertex data]
-vertex/float/3 gba/float/4 gba/float/4/1 gba/float/4/2
--1.0 -1.0 0.0 1.0 1.0 1.0 1.0 0.0 1.0 1.0 1.0 0.0 0.0 1.0 1.0
- 1.0 -1.0 0.0 1.0 1.0 1.0 1.0 0.0 1.0 1.0 1.0 0.0 0.0 1.0 1.0
- 1.0 1.0 0.0 1.0 1.0 1.0 1.0 0.0 1.0 1.0 1.0 0.0 0.0 1.0 1.0
--1.0 1.0 0.0 1.0 1.0 1.0 1.0 0.0 1.0 1.0 1.0 0.0 0.0 1.0 1.0
+vertex/float/3 gba/float/4 gba/float/4/1 gba/float/4/2
+-1.0 -1.0 0.0 0.25 0.5 0.75 1.0 0.0 0.25 0.5 1.0 0.0 0.0 0.5 1.0
+ 1.0 -1.0 0.0 0.25 0.5 0.75 1.0 0.0 0.25 0.5 1.0 0.0 0.0 0.5 1.0
+ 1.0 1.0 0.0 0.25 0.5 0.75 1.0 0.0 0.25 0.5 1.0 0.0 0.0 0.5 1.0
+-1.0 1.0 0.0 0.25 0.5 0.75 1.0 0.0 0.25 0.5 1.0 0.0 0.0 0.5 1.0
[test]
clear color 0.0 0.0 1.0 0.0
@@ -45,13 +45,13 @@ clear
uniform int index 0
draw arrays GL_TRIANGLE_FAN 0 4
-probe rgba 0 0 1.0 1.0 1.0 1.0
+probe rgba 0 0 0.25 0.5 0.75 1.0
uniform int index 1
draw arrays GL_TRIANGLE_FAN 0 4
-probe rgba 0 0 0.0 1.0 1.0 1.0
+probe rgba 0 0 0.0 0.25 0.5 1.0
uniform int index 2
draw arrays GL_TRIANGLE_FAN 0 4
-probe rgba 0 0 0.0 0.0 1.0 1.0
+probe rgba 0 0 0.0 0.0 0.5 1.0
diff --git a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs.shader_test b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs.shader_test
index f7776c826..971ee9969 100644
--- a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs.shader_test
+++ b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs.shader_test
@@ -23,8 +23,8 @@ void main()
{
gl_Position = vertex;
- a = vec3(0.0, 1.0, 1.0);
- b = 1.0;
+ a = vec3(0.0, 0.75, 1.0);
+ b = 0.25;
}
@@ -116,4 +116,4 @@ clear color 0.1 0.1 0.1 0.1
clear
patch parameter vertices 3
draw arrays GL_PATCHES 0 6
-probe all rgba 1.0 0.0 1.0 1.0
+probe all rgba 0.25 0.0 0.75 1.0