[Piglit] [PATCH 01/11] arb_gpu_shader5: Use 'piglit_vertex' and 'vertex shader passthrough'
Ian Romanick
idr at freedesktop.org
Wed Jun 29 21:23:01 UTC 2016
From: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
.../built-in-functions/const-bitCount.shader_test | 16 ++---------
.../const-bitfieldExtract.shader_test | 16 ++---------
.../const-bitfieldInsert.shader_test | 16 ++---------
.../const-bitfieldReverse.shader_test | 16 ++---------
.../built-in-functions/const-findLSB.shader_test | 16 ++---------
.../built-in-functions/const-findMSB.shader_test | 16 ++---------
.../built-in-functions/const-fma.shader_test | 16 ++---------
.../built-in-functions/const-ldexp.shader_test | 16 ++---------
.../built-in-functions/fs-bitCount.shader_test | 24 ++++------------
.../fs-bitfieldExtract.shader_test | 32 +++++++---------------
.../fs-bitfieldInsert.shader_test | 30 ++++++--------------
.../fs-bitfieldReverse.shader_test | 22 ++++-----------
.../built-in-functions/fs-findLSB.shader_test | 24 ++++------------
.../built-in-functions/fs-findMSB.shader_test | 31 ++++++---------------
.../built-in-functions/fs-fma.shader_test | 18 ++----------
.../built-in-functions/fs-frexp.shader_test | 20 +++-----------
.../built-in-functions/fs-ldexp.shader_test | 26 +++++-------------
.../built-in-functions/vs-bitCount.shader_test | 21 +++++---------
.../vs-bitfieldExtract.shader_test | 29 ++++++++------------
.../vs-bitfieldInsert.shader_test | 27 +++++++-----------
.../vs-bitfieldReverse.shader_test | 19 ++++---------
.../built-in-functions/vs-findLSB.shader_test | 21 +++++---------
.../built-in-functions/vs-findMSB.shader_test | 27 +++++++-----------
.../built-in-functions/vs-fma.shader_test | 15 +++-------
.../built-in-functions/vs-frexp.shader_test | 17 ++++--------
.../built-in-functions/vs-ldexp.shader_test | 23 ++++++----------
26 files changed, 143 insertions(+), 411 deletions(-)
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitCount.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitCount.shader_test
index dfbc224..f174c7a 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitCount.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitCount.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -37,13 +32,6 @@ void main()
STATIC_ASSERT(ivec4(32, 31, 31, 30) != bitCount(uvec4(0xFFFFFFFFu, 0xFFFFFFFEu, 0xFFFFFFFDu, 0xFFFFFFFCu)));
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldExtract.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldExtract.shader_test
index 8351b78..76dff96 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldExtract.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldExtract.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -36,13 +31,6 @@ void main()
STATIC_ASSERT(uvec4(0xFu, 0x0u, 0x1u, 0x3u) != bitfieldExtract(uvec4(0x000F0000u, 0x0000F000u, 0x0001C000u, 0x00038000u), 16, 4));
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldInsert.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldInsert.shader_test
index 9ac492b..010835f 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldInsert.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldInsert.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -34,13 +29,6 @@ void main()
STATIC_ASSERT(uvec4(0x000E000Fu, 0x0009000Fu, 0x0004000Fu, 0x0001000Fu) != bitfieldInsert(uvec4(0xFu), uvec4(0xEu, 0x9u, 0x4u, 0x1u), 16, 4));
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldReverse.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldReverse.shader_test
index 60caf2a..1737037 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldReverse.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-bitfieldReverse.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -34,13 +29,6 @@ void main()
STATIC_ASSERT(uvec4(0xF0C00000u, 0xF0000000u, 0x00008000u, 0x00000180u) != bitfieldReverse(uvec4(783u, 15u, 0x00010000u, 0x01800000u)));
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-findLSB.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-findLSB.shader_test
index 742a0d6..8ae164b 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-findLSB.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-findLSB.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -37,13 +32,6 @@ void main()
STATIC_ASSERT(ivec4(31, 30, 29, 28) != findLSB(uvec4(0x80000000u, 0x40000000u, 0x20000000u, 0x10000000u)));
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-findMSB.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-findMSB.shader_test
index ef875e6..bdb3a0c 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-findMSB.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-findMSB.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -38,13 +33,6 @@ void main()
STATIC_ASSERT(ivec4(31, 30, 29, 28) != findMSB(uvec4(0xFFFFFFFFu, 0x7FFFFFFFu, 0x3FFFFFFFu, 0x1FFFFFFFu)));
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-fma.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-fma.shader_test
index 50d8ded..2801edf 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-fma.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-fma.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -26,13 +21,6 @@ void main()
fma(vec4(0.0, -1.0, 2.0, 2.0), vec4(1.0, 1.0, -2.0, 2.0), vec4(-1.0, 1.0, 0.0, -3.0)));
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-ldexp.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-ldexp.shader_test
index 2fdeb83..fc9b507 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-ldexp.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/const-ldexp.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -37,13 +32,6 @@ void main()
floatBitsToInt(ldexp(vec4(1.1754944e-38, -1.1754944e-38, 3.40282347e38, -3.40282347e38), ivec4(-1, -1, -255, -255))));
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitCount.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitCount.shader_test
index aaec8b7..e50a718 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitCount.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitCount.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -31,40 +26,33 @@ void main()
color = vec4(0.0, 0.0, 1.0, 1.0);
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
uniform ivec4 bits 0 0 0 0
uniform ivec4 iinput 0 0 0 0
uniform uvec4 uinput 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 bits 1 1 1 1
uniform ivec4 iinput 1 2 4 8
uniform uvec4 uinput 1 2 4 8
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 bits 1 2 3 4
uniform ivec4 iinput 1 3 7 15
uniform uvec4 uinput 1 3 7 15
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 bits 6 6 3 5
uniform ivec4 iinput 783 111 385 484
uniform uvec4 uinput 783 111 385 484
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 bits 32 31 31 30
uniform ivec4 iinput -1 -2 -3 -4
uniform uvec4 uinput 0xFFFFFFFF 0xFFFFFFFE 0xFFFFFFFD 0xFFFFFFFC
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldExtract.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldExtract.shader_test
index 67d7a34..e098b59 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldExtract.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldExtract.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -36,13 +31,6 @@ void main()
color = vec4(0.0, 0.0, 1.0, 1.0);
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# Corner case: bits == 0 -> result == 0
uniform int bits 0
@@ -51,13 +39,13 @@ uniform int offset 32
uniform int test_signed 1
uniform ivec4 iextract 0 0 0 0
uniform ivec4 iinput 2147483647 15 7 3
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uextract 0 0 0 0
uniform uvec4 uinput 0xFFFFFFFF 15 7 3
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test that the most significant bits of the result get the sign extension of
@@ -69,14 +57,14 @@ uniform int offset 0
uniform int test_signed 1
uniform ivec4 iextract -1 -1 -1 -1
uniform ivec4 iinput 1 1 1 1
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Extract a single unsigned "1"-bit and sign-extend it, yielding 0x00000001 (1).
uniform int test_signed 0
uniform uvec4 uextract 1 1 1 1
uniform uvec4 uinput 1 1 1 1
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Extract two signed bits (01) and sign-extend it, yielding 0x00000001 (1).
@@ -85,7 +73,7 @@ uniform int bits 2
uniform int test_signed 1
uniform ivec4 iextract 1 -1 -1 1
uniform ivec4 iinput 1 3 3 1
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test some other various values.
@@ -99,13 +87,13 @@ uniform ivec4 iextract -1 0 1 3
# 114688 is 0x0001C000.
# 229376 is 0x00038000.
uniform ivec4 iinput 983040 61440 114688 229376
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uextract 0xF 0x0 0x1 0x3
uniform uvec4 uinput 0x000F0000 0x0000F000 0x0001C000 0x00038000
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Copy the whole integer
@@ -115,11 +103,11 @@ uniform int offset 0
uniform int test_signed 1
uniform ivec4 iextract 3203386110 3735928559 2343432205 3741239934
uniform ivec4 iinput 3203386110 3735928559 2343432205 3741239934
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uextract 0xBEEFCAFE 0xDEADBEEF 0x8BADF00D 0xDEFECA7E
uniform uvec4 uinput 0xBEEFCAFE 0xDEADBEEF 0x8BADF00D 0xDEFECA7E
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldInsert.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldInsert.shader_test
index 67add07..19bf84d 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldInsert.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldInsert.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -38,13 +33,6 @@ void main()
color = vec4(0.0, 0.0, 1.0, 1.0);
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# Corner case: bits == 0 -> result == base
uniform int bits 0
@@ -54,14 +42,14 @@ uniform int test_signed 1
uniform ivec4 iinsert 2147483647 15 7 3
uniform ivec4 ibase 42 56 72 97
uniform ivec4 iresult 42 56 72 97
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uinsert 0xFFFFFFFF 15 7 3
uniform uvec4 ubase 42 56 72 97
uniform uvec4 uresult 42 56 72 97
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
## Test overwriting set bits in <base>.
@@ -76,14 +64,14 @@ uniform ivec4 ibase 983055 983055 983055 983055
# 262159 is 0x0004000F.
# 65551 is 0x0001000F.
uniform ivec4 iresult 589839 262159 65551 15
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uinsert 0x9 0x4 0x1 0x0
uniform uvec4 ubase 0x000F000F 0x000F000F 0x000F000F 0x000F000F
uniform uvec4 uresult 0x0009000F 0x0004000F 0x0001000F 0x0000000F
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
## Test various cases.
@@ -98,14 +86,14 @@ uniform ivec4 ibase 15 15 15 15
# 262159 is 0x0004000F.
# 65551 is 0x0001000F.
uniform ivec4 iresult 917519 589839 262159 65551
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uinsert 0xE 0x9 0x4 0x1
uniform uvec4 ubase 0xF 0xF 0xF 0xF
uniform uvec4 uresult 0x000E000F 0x0009000F 0x0004000F 0x0001000F
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Copy the whole integer
@@ -116,12 +104,12 @@ uniform int test_signed 1
uniform ivec4 iinsert 3203386110 3735928559 2343432205 3741239934
uniform ivec4 ibase 0 0 0 0
uniform ivec4 iresult 3203386110 3735928559 2343432205 3741239934
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uinsert 0xBEEFCAFE 0xDEADBEEF 0x8BADF00D 0xDEFECA7E
uniform uvec4 ubase 0 0 0 0
uniform uvec4 uresult 0xBEEFCAFE 0xDEADBEEF 0x8BADF00D 0xDEFECA7E
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldReverse.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldReverse.shader_test
index d73cc68..51436ce 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldReverse.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-bitfieldReverse.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -32,38 +27,31 @@ void main()
color = vec4(0.0, 0.0, 1.0, 1.0);
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
uniform ivec4 iinput 0 -1 -1 0
uniform ivec4 ireverse 0 -1 -1 0
uniform uvec4 uinput 0 0xFFFFFFFF 0xFFFFFFFF 0
uniform uvec4 ureverse 0 0xFFFFFFFF 0xFFFFFFFF 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 iinput 1 2 4 8
uniform ivec4 ireverse -2147483648 1073741824 536870912 268435456
uniform uvec4 uinput 1 2 4 8
uniform uvec4 ureverse 0x80000000 0x40000000 0x20000000 0x10000000
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 iinput -2147483648 1073741824 536870912 268435456
uniform ivec4 ireverse 1 2 4 8
uniform uvec4 uinput 0x80000000 0x40000000 0x20000000 0x10000000
uniform uvec4 ureverse 1 2 4 8
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 iinput -255852544 -268435456 32768 25165824
uniform ivec4 ireverse 783 15 65536 384
uniform uvec4 uinput 783 15 0x00010000 0x01800000
uniform uvec4 ureverse 0xF0C00000 0xF0000000 0x00008000 0x00000180
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-findLSB.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-findLSB.shader_test
index b1752d0..d1f5cf8 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-findLSB.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-findLSB.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -31,41 +26,34 @@ void main()
color = vec4(0.0, 0.0, 1.0, 1.0);
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# If value is zero, -1 will be returned.
uniform ivec4 lsb -1 -1 -1 -1
uniform ivec4 iinput 0 0 0 0
uniform uvec4 uinput 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 lsb 0 1 0 2
uniform ivec4 iinput 1 2 3 4
uniform uvec4 uinput 1 2 3 4
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 lsb 10 9 8 7
uniform ivec4 iinput 1024 512 256 128
uniform uvec4 uinput 1024 512 256 128
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 lsb 0 1 0 2
uniform ivec4 iinput -1 -2 -3 -4
uniform uvec4 uinput 0xFFFFFFFF 0xFFFFFFFE 0xFFFFFFFD 0xFFFFFFFC
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 lsb 31 30 29 28
uniform ivec4 iinput -2147483648 1073741824 536870912 268435456
uniform uvec4 uinput 0x80000000 0x40000000 0x20000000 0x10000000
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-findMSB.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-findMSB.shader_test
index 9c38b80..f451299 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-findMSB.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-findMSB.shader_test
@@ -2,13 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
-
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -32,25 +26,18 @@ void main()
color = vec4(0.0, 0.0, 1.0, 1.0);
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# For a value of zero or negative one, -1 will be returned.
uniform int test_signed 1
uniform ivec4 msb -1 -1 -1 -1
uniform ivec4 iinput 0 -1 -1 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform ivec4 msb -1 -1 -1 -1
uniform uvec4 uinput 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Signed inputs
@@ -58,23 +45,23 @@ uniform int test_signed 1
uniform ivec4 msb 0 1 1 2
uniform ivec4 iinput 1 2 3 4
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 msb 30 29 28 27
uniform ivec4 iinput 2147483647 1073741823 536870911 268435455
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Most significant bit in negative signed integers is actually a zero.
uniform ivec4 msb 0 1 2 3
uniform ivec4 iinput -2 -3 -5 -9
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 msb 30 30 29 28
uniform ivec4 iinput -2147483648 -1879048192 -1073741824 -536870912
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Unsigned inputs
@@ -82,10 +69,10 @@ uniform int test_signed 0
uniform ivec4 msb 0 1 1 2
uniform uvec4 uinput 1 2 3 4
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 msb 31 30 29 28
uniform uvec4 uinput 0xFFFFFFFF 0x7FFFFFFF 0x3FFFFFFF 0x1FFFFFFF
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-fma.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-fma.shader_test
index f1c5957..a7ea0e9 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-fma.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-fma.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -35,24 +30,17 @@ void main()
}
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
uniform vec4 a 0.0 0.0 2.0 2.0
uniform vec4 b 1.0 1.0 2.0 2.0
uniform vec4 c 0.0 1.0 0.0 3.0
uniform vec4 expected 0.0 1.0 4.0 7.0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform vec4 a 0.0 -1.0 2.0 2.0
uniform vec4 b 1.0 1.0 -2.0 2.0
uniform vec4 c -1.0 1.0 0.0 -3.0
uniform vec4 expected -1.0 0.0 -4.0 1.0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-frexp.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-frexp.shader_test
index 2bef71d..a249b37 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-frexp.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-frexp.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -37,28 +32,21 @@ void main()
}
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
uniform vec4 given_float 0.0 -0.0 0.5 -0.5
uniform vec4 expected_mantissa 0.0 -0.0 0.5 -0.5
uniform ivec4 expected_exponent 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform vec4 given_float 0.49 1.0 25.0 100
uniform vec4 expected_mantissa 0.98 0.5 0.78125 0.78125
uniform ivec4 expected_exponent -1 1 5 7
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform vec4 given_float 1.1754944e-38 -1.1754944e-38 3.40282347e38 -3.40282347e38
uniform vec4 expected_mantissa 0.5 -0.5 0.999999940 -0.999999940
uniform ivec4 expected_exponent -125 -125 128 128
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-ldexp.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-ldexp.shader_test
index 989c1da..763e8bb 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-ldexp.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/fs-ldexp.shader_test
@@ -2,12 +2,7 @@
GLSL >= 1.50
GL_ARB_gpu_shader5
-[vertex shader]
-in vec4 vertex;
-
-void main() {
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_gpu_shader5 : enable
@@ -32,54 +27,47 @@ void main()
}
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# Basic tests with exponent = 0.
uniform vec4 expected_float 0.0 -0.0 0.5 -0.5
uniform vec4 given_float 0.0 -0.0 0.5 -0.5
uniform ivec4 given_exponent 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Basic tests with x = 0.
uniform vec4 expected_float 0.0 0.0 0.0 0.0
uniform vec4 given_float 0.0 0.0 0.0 0.0
uniform ivec4 given_exponent 1 100 -1 -100
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Basic tests.
uniform vec4 expected_float 0.49 1.0 25.0 100
uniform vec4 given_float 0.98 0.5 0.78125 0.78125
uniform ivec4 given_exponent -1 1 5 7
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test generating FLT_MIN (1.1754944e-38) and FLT_MAX (3.40282347e38).
uniform vec4 expected_float 1.1754944e-38 -1.1754944e-38 3.40282347e38 -3.40282347e38
uniform vec4 given_float 0.5 -0.5 0.999999940 -0.999999940
uniform ivec4 given_exponent -125 -125 128 128
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test FLT_MIN (1.1754944e-38) and FLT_MAX (3.40282347e38) as inputs.
uniform vec4 expected_float 0.5 -0.5 0.999999940 -0.999999940
uniform vec4 given_float 1.1754944e-38 -1.1754944e-38 3.40282347e38 -3.40282347e38
uniform ivec4 given_exponent 125 125 -128 -128
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test underflow generates zero with sign of x.
uniform vec4 expected_float 0.0 -0.0 0.0 -0.0
uniform vec4 given_float 0.0 -0.0 0.5 -0.5
uniform ivec4 given_exponent -127 -127 -127 -127
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Overflow is undefined according to the GLSL spec, so nothing to test.
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitCount.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitCount.shader_test
index a3a0db5..d4c33e0 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitCount.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitCount.shader_test
@@ -5,7 +5,7 @@ GL_ARB_gpu_shader5
[vertex shader]
#extension GL_ARB_gpu_shader5 : enable
-in vec4 vertex;
+in vec4 piglit_vertex;
out vec4 color;
uniform ivec4 bits;
@@ -13,7 +13,7 @@ uniform ivec4 iinput;
uniform uvec4 uinput;
void main() {
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
/* Green if both pass. */
color = vec4(0.0, 1.0, 0.0, 1.0);
@@ -35,40 +35,33 @@ void main()
frag_color = color;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
uniform ivec4 bits 0 0 0 0
uniform ivec4 iinput 0 0 0 0
uniform uvec4 uinput 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 bits 1 1 1 1
uniform ivec4 iinput 1 2 4 8
uniform uvec4 uinput 1 2 4 8
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 bits 1 2 3 4
uniform ivec4 iinput 1 3 7 15
uniform uvec4 uinput 1 3 7 15
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 bits 6 6 3 5
uniform ivec4 iinput 783 111 385 484
uniform uvec4 uinput 783 111 385 484
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 bits 32 31 31 30
uniform ivec4 iinput -1 -2 -3 -4
uniform uvec4 uinput 0xFFFFFFFF 0xFFFFFFFE 0xFFFFFFFD 0xFFFFFFFC
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldExtract.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldExtract.shader_test
index 35c7fc4..8104979 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldExtract.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldExtract.shader_test
@@ -5,7 +5,7 @@ GL_ARB_gpu_shader5
[vertex shader]
#extension GL_ARB_gpu_shader5 : enable
-in vec4 vertex;
+in vec4 piglit_vertex;
out vec4 color;
uniform bool test_signed;
@@ -18,7 +18,7 @@ uniform uvec4 uinput;
uniform int offset, bits;
void main() {
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
/* Green if both pass. */
color = vec4(0.0, 1.0, 0.0, 1.0);
@@ -40,13 +40,6 @@ void main()
frag_color = color;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# Corner case: bits == 0 -> result == 0
uniform int bits 0
@@ -55,13 +48,13 @@ uniform int offset 32
uniform int test_signed 1
uniform ivec4 iextract 0 0 0 0
uniform ivec4 iinput 2147483647 15 7 3
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uextract 0 0 0 0
uniform uvec4 uinput 0xFFFFFFFF 15 7 3
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test that the most significant bits of the result get the sign extension of
@@ -73,14 +66,14 @@ uniform int offset 0
uniform int test_signed 1
uniform ivec4 iextract -1 -1 -1 -1
uniform ivec4 iinput 1 1 1 1
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Extract a single unsigned "1"-bit and sign-extend it, yielding 0x00000001 (1).
uniform int test_signed 0
uniform uvec4 uextract 1 1 1 1
uniform uvec4 uinput 1 1 1 1
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Extract two signed bits (01) and sign-extend it, yielding 0x00000001 (1).
@@ -89,7 +82,7 @@ uniform int bits 2
uniform int test_signed 1
uniform ivec4 iextract 1 -1 -1 1
uniform ivec4 iinput 1 3 3 1
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test some other various values.
@@ -103,13 +96,13 @@ uniform ivec4 iextract -1 0 1 3
# 114688 is 0x0001C000.
# 229376 is 0x00038000.
uniform ivec4 iinput 983040 61440 114688 229376
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uextract 0xF 0x0 0x1 0x3
uniform uvec4 uinput 0x000F0000 0x0000F000 0x0001C000 0x00038000
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Copy the whole integer
@@ -119,11 +112,11 @@ uniform int offset 0
uniform int test_signed 1
uniform ivec4 iextract 3203386110 3735928559 2343432205 3741239934
uniform ivec4 iinput 3203386110 3735928559 2343432205 3741239934
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uextract 0xBEEFCAFE 0xDEADBEEF 0x8BADF00D 0xDEFECA7E
uniform uvec4 uinput 0xBEEFCAFE 0xDEADBEEF 0x8BADF00D 0xDEFECA7E
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldInsert.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldInsert.shader_test
index 09cf991..ac2bcd5 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldInsert.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldInsert.shader_test
@@ -5,7 +5,7 @@ GL_ARB_gpu_shader5
[vertex shader]
#extension GL_ARB_gpu_shader5 : enable
-in vec4 vertex;
+in vec4 piglit_vertex;
out vec4 color;
uniform bool test_signed;
@@ -20,7 +20,7 @@ uniform uvec4 uresult;
uniform int offset, bits;
void main() {
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
/* Green if both pass. */
color = vec4(0.0, 1.0, 0.0, 1.0);
@@ -42,13 +42,6 @@ void main()
frag_color = color;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# Corner case: bits == 0 -> result == base
uniform int bits 0
@@ -58,14 +51,14 @@ uniform int test_signed 1
uniform ivec4 iinsert 2147483647 15 7 3
uniform ivec4 ibase 42 56 72 97
uniform ivec4 iresult 42 56 72 97
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uinsert 0xFFFFFFFF 15 7 3
uniform uvec4 ubase 42 56 72 97
uniform uvec4 uresult 42 56 72 97
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test overwriting set bits in <base>.
@@ -80,14 +73,14 @@ uniform ivec4 ibase 983055 983055 983055 983055
# 262159 is 0x0004000F.
# 65551 is 0x0001000F.
uniform ivec4 iresult 589839 262159 65551 15
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uinsert 0x9 0x4 0x1 0x0
uniform uvec4 ubase 0x000F000F 0x000F000F 0x000F000F 0x000F000F
uniform uvec4 uresult 0x0009000F 0x0004000F 0x0001000F 0x0000000F
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
## Test various cases.
@@ -102,14 +95,14 @@ uniform ivec4 ibase 15 15 15 15
# 262159 is 0x0004000F.
# 65551 is 0x0001000F.
uniform ivec4 iresult 917519 589839 262159 65551
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uinsert 0xE 0x9 0x4 0x1
uniform uvec4 ubase 0xF 0xF 0xF 0xF
uniform uvec4 uresult 0x000E000F 0x0009000F 0x0004000F 0x0001000F
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Copy the whole integer
@@ -120,12 +113,12 @@ uniform int test_signed 1
uniform ivec4 iinsert 3203386110 3735928559 2343432205 3741239934
uniform ivec4 ibase 0 0 0 0
uniform ivec4 iresult 3203386110 3735928559 2343432205 3741239934
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform uvec4 uinsert 0xBEEFCAFE 0xDEADBEEF 0x8BADF00D 0xDEFECA7E
uniform uvec4 ubase 0 0 0 0
uniform uvec4 uresult 0xBEEFCAFE 0xDEADBEEF 0x8BADF00D 0xDEFECA7E
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldReverse.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldReverse.shader_test
index 4a52e50..7b4d9b4 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldReverse.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-bitfieldReverse.shader_test
@@ -5,7 +5,7 @@ GL_ARB_gpu_shader5
[vertex shader]
#extension GL_ARB_gpu_shader5 : enable
-in vec4 vertex;
+in vec4 piglit_vertex;
out vec4 color;
uniform ivec4 ireverse;
@@ -14,7 +14,7 @@ uniform uvec4 ureverse;
uniform uvec4 uinput;
void main() {
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
/* Green if both pass. */
color = vec4(0.0, 1.0, 0.0, 1.0);
@@ -36,38 +36,31 @@ void main()
frag_color = color;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
uniform ivec4 iinput 0 -1 -1 0
uniform ivec4 ireverse 0 -1 -1 0
uniform uvec4 uinput 0 0xFFFFFFFF 0xFFFFFFFF 0
uniform uvec4 ureverse 0 0xFFFFFFFF 0xFFFFFFFF 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 iinput 1 2 4 8
uniform ivec4 ireverse -2147483648 1073741824 536870912 268435456
uniform uvec4 uinput 1 2 4 8
uniform uvec4 ureverse 0x80000000 0x40000000 0x20000000 0x10000000
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 iinput -2147483648 1073741824 536870912 268435456
uniform ivec4 ireverse 1 2 4 8
uniform uvec4 uinput 0x80000000 0x40000000 0x20000000 0x10000000
uniform uvec4 ureverse 1 2 4 8
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 iinput -255852544 -268435456 32768 25165824
uniform ivec4 ireverse 783 15 65536 384
uniform uvec4 uinput 783 15 0x00010000 0x01800000
uniform uvec4 ureverse 0xF0C00000 0xF0000000 0x00008000 0x00000180
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-findLSB.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-findLSB.shader_test
index 4522cfd..d2d1448 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-findLSB.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-findLSB.shader_test
@@ -5,7 +5,7 @@ GL_ARB_gpu_shader5
[vertex shader]
#extension GL_ARB_gpu_shader5 : enable
-in vec4 vertex;
+in vec4 piglit_vertex;
out vec4 color;
uniform ivec4 lsb;
@@ -13,7 +13,7 @@ uniform ivec4 iinput;
uniform uvec4 uinput;
void main() {
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
/* Green if both pass. */
color = vec4(0.0, 1.0, 0.0, 1.0);
@@ -35,41 +35,34 @@ void main()
frag_color = color;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# If value is zero, -1 will be returned.
uniform ivec4 lsb -1 -1 -1 -1
uniform ivec4 iinput 0 0 0 0
uniform uvec4 uinput 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 lsb 0 1 0 2
uniform ivec4 iinput 1 2 3 4
uniform uvec4 uinput 1 2 3 4
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 lsb 10 9 8 7
uniform ivec4 iinput 1024 512 256 128
uniform uvec4 uinput 1024 512 256 128
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 lsb 0 1 0 2
uniform ivec4 iinput -1 -2 -3 -4
uniform uvec4 uinput 0xFFFFFFFF 0xFFFFFFFE 0xFFFFFFFD 0xFFFFFFFC
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 lsb 31 30 29 28
uniform ivec4 iinput -2147483648 1073741824 536870912 268435456
uniform uvec4 uinput 0x80000000 0x40000000 0x20000000 0x10000000
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-findMSB.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-findMSB.shader_test
index 8aa4323..b146376 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-findMSB.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-findMSB.shader_test
@@ -5,7 +5,7 @@ GL_ARB_gpu_shader5
[vertex shader]
#extension GL_ARB_gpu_shader5 : enable
-in vec4 vertex;
+in vec4 piglit_vertex;
out vec4 color;
uniform bool test_signed;
@@ -14,7 +14,7 @@ uniform ivec4 iinput;
uniform uvec4 uinput;
void main() {
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
/* Green if both pass. */
color = vec4(0.0, 1.0, 0.0, 1.0);
@@ -36,25 +36,18 @@ void main()
frag_color = color;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# For a value of zero or negative one, -1 will be returned.
uniform int test_signed 1
uniform ivec4 msb -1 -1 -1 -1
uniform ivec4 iinput 0 -1 -1 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform int test_signed 0
uniform ivec4 msb -1 -1 -1 -1
uniform uvec4 uinput 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Signed inputs
@@ -62,23 +55,23 @@ uniform int test_signed 1
uniform ivec4 msb 0 1 1 2
uniform ivec4 iinput 1 2 3 4
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 msb 30 29 28 27
uniform ivec4 iinput 2147483647 1073741823 536870911 268435455
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Most significant bit in negative signed integers is actually a zero.
uniform ivec4 msb 0 1 2 3
uniform ivec4 iinput -2 -3 -5 -9
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 msb 30 30 29 28
uniform ivec4 iinput -2147483648 -1879048192 -1073741824 -536870912
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Unsigned inputs
@@ -86,10 +79,10 @@ uniform int test_signed 0
uniform ivec4 msb 0 1 1 2
uniform uvec4 uinput 1 2 3 4
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform ivec4 msb 31 30 29 28
uniform uvec4 uinput 0xFFFFFFFF 0x7FFFFFFF 0x3FFFFFFF 0x1FFFFFFF
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-fma.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-fma.shader_test
index 644a387..479f193 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-fma.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-fma.shader_test
@@ -5,14 +5,14 @@ GL_ARB_gpu_shader5
[vertex shader]
#extension GL_ARB_gpu_shader5 : enable
-in vec4 vertex;
+in vec4 piglit_vertex;
out vec4 color;
uniform vec4 a, b, c;
uniform vec4 expected;
void main() {
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
color = vec4(0.0, 1.0, 0.0, 1.0);
@@ -39,24 +39,17 @@ void main()
frag_color = color;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
uniform vec4 a 0.0 0.0 2.0 2.0
uniform vec4 b 1.0 1.0 2.0 2.0
uniform vec4 c 0.0 1.0 0.0 3.0
uniform vec4 expected 0.0 1.0 4.0 7.0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform vec4 a 0.0 -1.0 2.0 2.0
uniform vec4 b 1.0 1.0 -2.0 2.0
uniform vec4 c -1.0 1.0 0.0 -3.0
uniform vec4 expected -1.0 0.0 -4.0 1.0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-frexp.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-frexp.shader_test
index 8eaeb03..e1f6b15 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-frexp.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-frexp.shader_test
@@ -5,7 +5,7 @@ GL_ARB_gpu_shader5
[vertex shader]
#extension GL_ARB_gpu_shader5 : enable
-in vec4 vertex;
+in vec4 piglit_vertex;
out vec4 color;
uniform vec4 given_float;
@@ -13,7 +13,7 @@ uniform vec4 expected_mantissa;
uniform ivec4 expected_exponent;
void main() {
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
/* Green if both pass. */
color = vec4(0.0, 1.0, 0.0, 1.0);
@@ -41,28 +41,21 @@ void main()
frag_color = color;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
uniform vec4 given_float 0.0 -0.0 0.5 -0.5
uniform vec4 expected_mantissa 0.0 -0.0 0.5 -0.5
uniform ivec4 expected_exponent 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform vec4 given_float 0.49 1.0 25.0 100
uniform vec4 expected_mantissa 0.98 0.5 0.78125 0.78125
uniform ivec4 expected_exponent -1 1 5 7
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
uniform vec4 given_float 1.1754944e-38 -1.1754944e-38 3.40282347e38 -3.40282347e38
uniform vec4 expected_mantissa 0.5 -0.5 0.999999940 -0.999999940
uniform ivec4 expected_exponent -125 -125 128 128
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-ldexp.shader_test b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-ldexp.shader_test
index 041c645..b819f8a 100644
--- a/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-ldexp.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/built-in-functions/vs-ldexp.shader_test
@@ -5,7 +5,7 @@ GL_ARB_gpu_shader5
[vertex shader]
#extension GL_ARB_gpu_shader5 : enable
-in vec4 vertex;
+in vec4 piglit_vertex;
out vec4 color;
uniform vec4 expected_float;
@@ -14,7 +14,7 @@ uniform ivec4 given_exponent;
void main()
{
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
/* Green if both pass. */
color = vec4(0.0, 1.0, 0.0, 1.0);
@@ -37,54 +37,47 @@ void main()
frag_color = color;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
# Basic tests with exponent = 0.
uniform vec4 expected_float 0.0 -0.0 0.5 -0.5
uniform vec4 given_float 0.0 -0.0 0.5 -0.5
uniform ivec4 given_exponent 0 0 0 0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Basic tests with x = 0.
uniform vec4 expected_float 0.0 0.0 0.0 0.0
uniform vec4 given_float 0.0 0.0 0.0 0.0
uniform ivec4 given_exponent 1 100 -1 -100
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Basic tests.
uniform vec4 expected_float 0.49 1.0 25.0 100
uniform vec4 given_float 0.98 0.5 0.78125 0.78125
uniform ivec4 given_exponent -1 1 5 7
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test generating FLT_MIN (1.1754944e-38) and FLT_MAX (3.40282347e38).
uniform vec4 expected_float 1.1754944e-38 -1.1754944e-38 3.40282347e38 -3.40282347e38
uniform vec4 given_float 0.5 -0.5 0.999999940 -0.999999940
uniform ivec4 given_exponent -125 -125 128 128
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test FLT_MIN (1.1754944e-38) and FLT_MAX (3.40282347e38) as inputs.
uniform vec4 expected_float 0.5 -0.5 0.999999940 -0.999999940
uniform vec4 given_float 1.1754944e-38 -1.1754944e-38 3.40282347e38 -3.40282347e38
uniform ivec4 given_exponent 125 125 -128 -128
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test underflow generates zero with sign of x.
uniform vec4 expected_float 0.0 -0.0 0.0 -0.0
uniform vec4 given_float 0.0 -0.0 0.5 -0.5
uniform ivec4 given_exponent -127 -127 -127 -127
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Overflow is undefined according to the GLSL spec, so nothing to test.
--
2.5.5
More information about the Piglit
mailing list