diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-07-03 21:33:23 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-08-05 17:08:43 -0700 |
| commit | 2da85f2c221c5e4556e6d4e46ce6191fcc8c8629 (patch) | |
| tree | 5643507fdfdcc76f56b2b1758a9cb6df68c81654 /tests | |
| parent | ac78a08a64055423fb36145657181de179710d3e (diff) | |
Replace [vertex/fragment shader file] sections in shader_test files.
This replaces sections like:
[fragment shader file]
glsl-color.frag
with [fragment shader] and the contents of that file.
The majority of shader_test files include all their shaders in a single
file, which is nice: you can read and understand them all at a glance,
without having to open multiple files. You also don't need to worry
about extra data files that live in some path.
In roughly 60% of these cases, the shader file being included was a
a single line (such as gl_FragColor = gl_Color), so just importing it
into the shader_test doesn't even add much extra data. The other 40%
were shadow tests where it added a bit more, but it's still not
horrible.
This commit was autogenerated by a python script, with extra 'git rm's
for the unnecessary .vert/.frag files after the conversion.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'tests')
216 files changed, 1987 insertions, 687 deletions
diff --git a/tests/shaders/arb_texture_gather-miplevels.shader_test b/tests/shaders/arb_texture_gather-miplevels.shader_test index 88d5f8da6..6d528972c 100644 --- a/tests/shaders/arb_texture_gather-miplevels.shader_test +++ b/tests/shaders/arb_texture_gather-miplevels.shader_test @@ -2,8 +2,11 @@ GLSL >= 1.30 GL_ARB_texture_gather -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] #extension GL_ARB_texture_gather: require diff --git a/tests/shaders/glsl-array-bounds-01.shader_test b/tests/shaders/glsl-array-bounds-01.shader_test index 82cf649f6..2e7c7620c 100644 --- a/tests/shaders/glsl-array-bounds-01.shader_test +++ b/tests/shaders/glsl-array-bounds-01.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] /* Verify that out-of-bounds access to an array does not result in any sort of diff --git a/tests/shaders/glsl-array-bounds-02.shader_test b/tests/shaders/glsl-array-bounds-02.shader_test index f5f903528..f9c8202cb 100644 --- a/tests/shaders/glsl-array-bounds-02.shader_test +++ b/tests/shaders/glsl-array-bounds-02.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] /* Verify that out-of-bounds access to an array does not result in any sort of diff --git a/tests/shaders/glsl-array-bounds-03.shader_test b/tests/shaders/glsl-array-bounds-03.shader_test index 210ea5cc2..1d7908464 100644 --- a/tests/shaders/glsl-array-bounds-03.shader_test +++ b/tests/shaders/glsl-array-bounds-03.shader_test @@ -23,8 +23,11 @@ void main() gl_FrontColor = vec4(0.0, 1.0, 0.0, 1.0); } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] clear color 0.0 0.0 0.0 0.0 diff --git a/tests/shaders/glsl-array-bounds-04.shader_test b/tests/shaders/glsl-array-bounds-04.shader_test index 2c09b7613..8e21e7ab8 100644 --- a/tests/shaders/glsl-array-bounds-04.shader_test +++ b/tests/shaders/glsl-array-bounds-04.shader_test @@ -22,8 +22,11 @@ void main() gl_FrontColor = vec4(0.0, 1.0, 0.0, 1.0); } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] uniform int idx 20 diff --git a/tests/shaders/glsl-array-bounds-05.shader_test b/tests/shaders/glsl-array-bounds-05.shader_test index 63db5c284..b2ec3011c 100644 --- a/tests/shaders/glsl-array-bounds-05.shader_test +++ b/tests/shaders/glsl-array-bounds-05.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] /* Verify that out-of-bounds access to an array does not result in any sort of diff --git a/tests/shaders/glsl-array-bounds-06.shader_test b/tests/shaders/glsl-array-bounds-06.shader_test index 2b87f0b08..c540ff18a 100644 --- a/tests/shaders/glsl-array-bounds-06.shader_test +++ b/tests/shaders/glsl-array-bounds-06.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] /* Verify that out-of-bounds access to an array does not result in any sort of diff --git a/tests/shaders/glsl-array-bounds-07.shader_test b/tests/shaders/glsl-array-bounds-07.shader_test index b42cbe269..7bc3a0516 100644 --- a/tests/shaders/glsl-array-bounds-07.shader_test +++ b/tests/shaders/glsl-array-bounds-07.shader_test @@ -23,8 +23,11 @@ void main() gl_FrontColor = vec4(0.0, 1.0, 0.0, 1.0); } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] clear color 0.0 0.0 0.0 0.0 diff --git a/tests/shaders/glsl-array-bounds-08.shader_test b/tests/shaders/glsl-array-bounds-08.shader_test index b3aaa0161..5fddc1062 100644 --- a/tests/shaders/glsl-array-bounds-08.shader_test +++ b/tests/shaders/glsl-array-bounds-08.shader_test @@ -22,8 +22,11 @@ void main() gl_FrontColor = vec4(0.0, 1.0, 0.0, 1.0); } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] uniform int idx -20 diff --git a/tests/shaders/glsl-array-length.shader_test b/tests/shaders/glsl-array-length.shader_test index ccf217d52..c923e2899 100644 --- a/tests/shaders/glsl-array-length.shader_test +++ b/tests/shaders/glsl-array-length.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] #version 120 diff --git a/tests/shaders/glsl-array-uniform-length.shader_test b/tests/shaders/glsl-array-uniform-length.shader_test index a5ce5dd0f..d8445b440 100644 --- a/tests/shaders/glsl-array-uniform-length.shader_test +++ b/tests/shaders/glsl-array-uniform-length.shader_test @@ -2,8 +2,11 @@ GL >= 2.0 GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] #version 120 diff --git a/tests/shaders/glsl-const-builtin-abs.shader_test b/tests/shaders/glsl-const-builtin-abs.shader_test index 41a204db7..34a1ac932 100644 --- a/tests/shaders/glsl-const-builtin-abs.shader_test +++ b/tests/shaders/glsl-const-builtin-abs.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-acos.shader_test b/tests/shaders/glsl-const-builtin-acos.shader_test index 9ba28d9cb..1df01ca81 100644 --- a/tests/shaders/glsl-const-builtin-acos.shader_test +++ b/tests/shaders/glsl-const-builtin-acos.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-all.shader_test b/tests/shaders/glsl-const-builtin-all.shader_test index 75c986788..8eada1536 100644 --- a/tests/shaders/glsl-const-builtin-all.shader_test +++ b/tests/shaders/glsl-const-builtin-all.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-any.shader_test b/tests/shaders/glsl-const-builtin-any.shader_test index adeaa163a..bc244eb21 100644 --- a/tests/shaders/glsl-const-builtin-any.shader_test +++ b/tests/shaders/glsl-const-builtin-any.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-asin.shader_test b/tests/shaders/glsl-const-builtin-asin.shader_test index b73578c6d..0cfcdd0a8 100644 --- a/tests/shaders/glsl-const-builtin-asin.shader_test +++ b/tests/shaders/glsl-const-builtin-asin.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-atan.shader_test b/tests/shaders/glsl-const-builtin-atan.shader_test index f77296ec7..3a5ed45d0 100644 --- a/tests/shaders/glsl-const-builtin-atan.shader_test +++ b/tests/shaders/glsl-const-builtin-atan.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-ceil.shader_test b/tests/shaders/glsl-const-builtin-ceil.shader_test index 13ff31859..c27ca17cb 100644 --- a/tests/shaders/glsl-const-builtin-ceil.shader_test +++ b/tests/shaders/glsl-const-builtin-ceil.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-clamp.shader_test b/tests/shaders/glsl-const-builtin-clamp.shader_test index d3551d1e8..9ce95a73b 100644 --- a/tests/shaders/glsl-const-builtin-clamp.shader_test +++ b/tests/shaders/glsl-const-builtin-clamp.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-cos.shader_test b/tests/shaders/glsl-const-builtin-cos.shader_test index 50ab05767..a5e6ac75e 100644 --- a/tests/shaders/glsl-const-builtin-cos.shader_test +++ b/tests/shaders/glsl-const-builtin-cos.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-cosh.shader_test b/tests/shaders/glsl-const-builtin-cosh.shader_test index 29864245e..d44319f92 100644 --- a/tests/shaders/glsl-const-builtin-cosh.shader_test +++ b/tests/shaders/glsl-const-builtin-cosh.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.30 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-cross.shader_test b/tests/shaders/glsl-const-builtin-cross.shader_test index e4c5a37c8..b5a3646d0 100644 --- a/tests/shaders/glsl-const-builtin-cross.shader_test +++ b/tests/shaders/glsl-const-builtin-cross.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-degrees.shader_test b/tests/shaders/glsl-const-builtin-degrees.shader_test index 70b82d652..d33c9176e 100644 --- a/tests/shaders/glsl-const-builtin-degrees.shader_test +++ b/tests/shaders/glsl-const-builtin-degrees.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-derivatives.shader_test b/tests/shaders/glsl-const-builtin-derivatives.shader_test index e5a8b4143..cc0103151 100644 --- a/tests/shaders/glsl-const-builtin-derivatives.shader_test +++ b/tests/shaders/glsl-const-builtin-derivatives.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-distance.shader_test b/tests/shaders/glsl-const-builtin-distance.shader_test index 36413207c..460313c25 100644 --- a/tests/shaders/glsl-const-builtin-distance.shader_test +++ b/tests/shaders/glsl-const-builtin-distance.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-dot.shader_test b/tests/shaders/glsl-const-builtin-dot.shader_test index ef3ded38c..446601518 100644 --- a/tests/shaders/glsl-const-builtin-dot.shader_test +++ b/tests/shaders/glsl-const-builtin-dot.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-equal-bool.shader_test b/tests/shaders/glsl-const-builtin-equal-bool.shader_test index 7e88639a6..91d8d867b 100644 --- a/tests/shaders/glsl-const-builtin-equal-bool.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-bool.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-equal.shader_test b/tests/shaders/glsl-const-builtin-equal.shader_test index abbcba39a..77c423497 100644 --- a/tests/shaders/glsl-const-builtin-equal.shader_test +++ b/tests/shaders/glsl-const-builtin-equal.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-exp.shader_test b/tests/shaders/glsl-const-builtin-exp.shader_test index c5f2c3f75..18bf8c662 100644 --- a/tests/shaders/glsl-const-builtin-exp.shader_test +++ b/tests/shaders/glsl-const-builtin-exp.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-exp2.shader_test b/tests/shaders/glsl-const-builtin-exp2.shader_test index bad497ecf..e3bada7aa 100644 --- a/tests/shaders/glsl-const-builtin-exp2.shader_test +++ b/tests/shaders/glsl-const-builtin-exp2.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-faceforward.shader_test b/tests/shaders/glsl-const-builtin-faceforward.shader_test index b66aaff71..91ae5cc96 100644 --- a/tests/shaders/glsl-const-builtin-faceforward.shader_test +++ b/tests/shaders/glsl-const-builtin-faceforward.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-floor.shader_test b/tests/shaders/glsl-const-builtin-floor.shader_test index 1fa3e5ab1..af7732205 100644 --- a/tests/shaders/glsl-const-builtin-floor.shader_test +++ b/tests/shaders/glsl-const-builtin-floor.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-fract.shader_test b/tests/shaders/glsl-const-builtin-fract.shader_test index 9f694de45..0c3bc83cd 100644 --- a/tests/shaders/glsl-const-builtin-fract.shader_test +++ b/tests/shaders/glsl-const-builtin-fract.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-greaterThan.shader_test b/tests/shaders/glsl-const-builtin-greaterThan.shader_test index 594379b76..76c4a172c 100644 --- a/tests/shaders/glsl-const-builtin-greaterThan.shader_test +++ b/tests/shaders/glsl-const-builtin-greaterThan.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test b/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test index a99b5a6f1..3b6d3295f 100644 --- a/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test +++ b/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-inversesqrt.shader_test b/tests/shaders/glsl-const-builtin-inversesqrt.shader_test index 5f208e45a..17f9d2859 100644 --- a/tests/shaders/glsl-const-builtin-inversesqrt.shader_test +++ b/tests/shaders/glsl-const-builtin-inversesqrt.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-length.shader_test b/tests/shaders/glsl-const-builtin-length.shader_test index 3058d0327..1a2e4e869 100644 --- a/tests/shaders/glsl-const-builtin-length.shader_test +++ b/tests/shaders/glsl-const-builtin-length.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-lessThan.shader_test b/tests/shaders/glsl-const-builtin-lessThan.shader_test index 143d92a04..31f19ba70 100644 --- a/tests/shaders/glsl-const-builtin-lessThan.shader_test +++ b/tests/shaders/glsl-const-builtin-lessThan.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test b/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test index 0fd7a75bf..dc1195fe2 100644 --- a/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test +++ b/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-log.shader_test b/tests/shaders/glsl-const-builtin-log.shader_test index f368f5ee6..487fc36ee 100644 --- a/tests/shaders/glsl-const-builtin-log.shader_test +++ b/tests/shaders/glsl-const-builtin-log.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-log2.shader_test b/tests/shaders/glsl-const-builtin-log2.shader_test index 96d5acf55..d2e1bb1b8 100644 --- a/tests/shaders/glsl-const-builtin-log2.shader_test +++ b/tests/shaders/glsl-const-builtin-log2.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test b/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test index 177053763..694739b67 100644 --- a/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test +++ b/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-max.shader_test b/tests/shaders/glsl-const-builtin-max.shader_test index c9b0f7b2a..7f1d88d6f 100644 --- a/tests/shaders/glsl-const-builtin-max.shader_test +++ b/tests/shaders/glsl-const-builtin-max.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-min.shader_test b/tests/shaders/glsl-const-builtin-min.shader_test index a75ca18b7..e98c66110 100644 --- a/tests/shaders/glsl-const-builtin-min.shader_test +++ b/tests/shaders/glsl-const-builtin-min.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-mix.shader_test b/tests/shaders/glsl-const-builtin-mix.shader_test index c652ad09a..9732d3b1a 100644 --- a/tests/shaders/glsl-const-builtin-mix.shader_test +++ b/tests/shaders/glsl-const-builtin-mix.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-mod.shader_test b/tests/shaders/glsl-const-builtin-mod.shader_test index c33d2ec05..4b85e7800 100644 --- a/tests/shaders/glsl-const-builtin-mod.shader_test +++ b/tests/shaders/glsl-const-builtin-mod.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-normalize.shader_test b/tests/shaders/glsl-const-builtin-normalize.shader_test index b2c4f1590..c94179171 100644 --- a/tests/shaders/glsl-const-builtin-normalize.shader_test +++ b/tests/shaders/glsl-const-builtin-normalize.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-not.shader_test b/tests/shaders/glsl-const-builtin-not.shader_test index 2dce0e7ac..8c5853df9 100644 --- a/tests/shaders/glsl-const-builtin-not.shader_test +++ b/tests/shaders/glsl-const-builtin-not.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test b/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test index 762d47770..075834bc3 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-notEqual.shader_test b/tests/shaders/glsl-const-builtin-notEqual.shader_test index 73dc9303f..70921698b 100644 --- a/tests/shaders/glsl-const-builtin-notEqual.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-outerProduct.shader_test b/tests/shaders/glsl-const-builtin-outerProduct.shader_test index 980ea93da..b94df1bac 100644 --- a/tests/shaders/glsl-const-builtin-outerProduct.shader_test +++ b/tests/shaders/glsl-const-builtin-outerProduct.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-pow.shader_test b/tests/shaders/glsl-const-builtin-pow.shader_test index 32998c566..8927ab199 100644 --- a/tests/shaders/glsl-const-builtin-pow.shader_test +++ b/tests/shaders/glsl-const-builtin-pow.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-radians.shader_test b/tests/shaders/glsl-const-builtin-radians.shader_test index e862d82f5..0d8f0b435 100644 --- a/tests/shaders/glsl-const-builtin-radians.shader_test +++ b/tests/shaders/glsl-const-builtin-radians.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-reflect.shader_test b/tests/shaders/glsl-const-builtin-reflect.shader_test index cd0e3c473..137c1335a 100644 --- a/tests/shaders/glsl-const-builtin-reflect.shader_test +++ b/tests/shaders/glsl-const-builtin-reflect.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-refract.shader_test b/tests/shaders/glsl-const-builtin-refract.shader_test index 2d0ebcd2b..465365cd8 100644 --- a/tests/shaders/glsl-const-builtin-refract.shader_test +++ b/tests/shaders/glsl-const-builtin-refract.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-sign.shader_test b/tests/shaders/glsl-const-builtin-sign.shader_test index 11d07dcb5..5dce5c882 100644 --- a/tests/shaders/glsl-const-builtin-sign.shader_test +++ b/tests/shaders/glsl-const-builtin-sign.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-sin.shader_test b/tests/shaders/glsl-const-builtin-sin.shader_test index 0d9150c72..3668f479d 100644 --- a/tests/shaders/glsl-const-builtin-sin.shader_test +++ b/tests/shaders/glsl-const-builtin-sin.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-smoothstep.shader_test b/tests/shaders/glsl-const-builtin-smoothstep.shader_test index f4582e22f..8b86314c9 100644 --- a/tests/shaders/glsl-const-builtin-smoothstep.shader_test +++ b/tests/shaders/glsl-const-builtin-smoothstep.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-sqrt.shader_test b/tests/shaders/glsl-const-builtin-sqrt.shader_test index 3bf7a4f39..342e052bf 100644 --- a/tests/shaders/glsl-const-builtin-sqrt.shader_test +++ b/tests/shaders/glsl-const-builtin-sqrt.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-step.shader_test b/tests/shaders/glsl-const-builtin-step.shader_test index e7ce1487c..5ffc715b3 100644 --- a/tests/shaders/glsl-const-builtin-step.shader_test +++ b/tests/shaders/glsl-const-builtin-step.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-builtin-tan.shader_test b/tests/shaders/glsl-const-builtin-tan.shader_test index 963bf1f90..0ddc1c3a2 100644 --- a/tests/shaders/glsl-const-builtin-tan.shader_test +++ b/tests/shaders/glsl-const-builtin-tan.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() { diff --git a/tests/shaders/glsl-const-builtin-transpose.shader_test b/tests/shaders/glsl-const-builtin-transpose.shader_test index 449c3073d..bc0202238 100644 --- a/tests/shaders/glsl-const-builtin-transpose.shader_test +++ b/tests/shaders/glsl-const-builtin-transpose.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-const-folding-01.shader_test b/tests/shaders/glsl-const-folding-01.shader_test index 48feac726..35abc211f 100644 --- a/tests/shaders/glsl-const-folding-01.shader_test +++ b/tests/shaders/glsl-const-folding-01.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] /* This test requires version 1.20 because it depends on the new constant diff --git a/tests/shaders/glsl-fs-array-redeclaration.shader_test b/tests/shaders/glsl-fs-array-redeclaration.shader_test index cf180aa4e..37950c36f 100644 --- a/tests/shaders/glsl-fs-array-redeclaration.shader_test +++ b/tests/shaders/glsl-fs-array-redeclaration.shader_test @@ -2,8 +2,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] #version 120 diff --git a/tests/shaders/glsl-fs-ceil.shader_test b/tests/shaders/glsl-fs-ceil.shader_test index faf356d19..6a5b8f144 100644 --- a/tests/shaders/glsl-fs-ceil.shader_test +++ b/tests/shaders/glsl-fs-ceil.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-discard-01.shader_test b/tests/shaders/glsl-fs-discard-01.shader_test index 5b16318b5..e51391d29 100644 --- a/tests/shaders/glsl-fs-discard-01.shader_test +++ b/tests/shaders/glsl-fs-discard-01.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-floor.shader_test b/tests/shaders/glsl-fs-floor.shader_test index 1d4da4656..3562c0edf 100644 --- a/tests/shaders/glsl-fs-floor.shader_test +++ b/tests/shaders/glsl-fs-floor.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-if-greater-equal.shader_test b/tests/shaders/glsl-fs-if-greater-equal.shader_test index 8b0794f53..a1a2d23e3 100644 --- a/tests/shaders/glsl-fs-if-greater-equal.shader_test +++ b/tests/shaders/glsl-fs-if-greater-equal.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-if-greater.shader_test b/tests/shaders/glsl-fs-if-greater.shader_test index c70f9ed5c..8c22478d2 100644 --- a/tests/shaders/glsl-fs-if-greater.shader_test +++ b/tests/shaders/glsl-fs-if-greater.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-if-less-equal.shader_test b/tests/shaders/glsl-fs-if-less-equal.shader_test index bfcfd9519..7cd95d4c8 100644 --- a/tests/shaders/glsl-fs-if-less-equal.shader_test +++ b/tests/shaders/glsl-fs-if-less-equal.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-if-less.shader_test b/tests/shaders/glsl-fs-if-less.shader_test index ff927dd00..710ba6a03 100644 --- a/tests/shaders/glsl-fs-if-less.shader_test +++ b/tests/shaders/glsl-fs-if-less.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-300.shader_test b/tests/shaders/glsl-fs-loop-300.shader_test index b171b8790..ac8acc9d9 100644 --- a/tests/shaders/glsl-fs-loop-300.shader_test +++ b/tests/shaders/glsl-fs-loop-300.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] // Pass loop info as uniforms to avoid unrolling diff --git a/tests/shaders/glsl-fs-loop-const-decr.shader_test b/tests/shaders/glsl-fs-loop-const-decr.shader_test index ba27a8aab..d0fe00560 100644 --- a/tests/shaders/glsl-fs-loop-const-decr.shader_test +++ b/tests/shaders/glsl-fs-loop-const-decr.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] uniform vec4 color; diff --git a/tests/shaders/glsl-fs-loop-const-incr.shader_test b/tests/shaders/glsl-fs-loop-const-incr.shader_test index d586e948d..1cdf4ff73 100644 --- a/tests/shaders/glsl-fs-loop-const-incr.shader_test +++ b/tests/shaders/glsl-fs-loop-const-incr.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] uniform vec4 color; diff --git a/tests/shaders/glsl-fs-loop-ge.shader_test b/tests/shaders/glsl-fs-loop-ge.shader_test index 523d01a47..f6a15e854 100644 --- a/tests/shaders/glsl-fs-loop-ge.shader_test +++ b/tests/shaders/glsl-fs-loop-ge.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-gt.shader_test b/tests/shaders/glsl-fs-loop-gt.shader_test index de1672685..83755b460 100644 --- a/tests/shaders/glsl-fs-loop-gt.shader_test +++ b/tests/shaders/glsl-fs-loop-gt.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-le.shader_test b/tests/shaders/glsl-fs-loop-le.shader_test index e9af169ee..79bca0822 100644 --- a/tests/shaders/glsl-fs-loop-le.shader_test +++ b/tests/shaders/glsl-fs-loop-le.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-lt.shader_test b/tests/shaders/glsl-fs-loop-lt.shader_test index 47e46f194..2a8b94b5d 100644 --- a/tests/shaders/glsl-fs-loop-lt.shader_test +++ b/tests/shaders/glsl-fs-loop-lt.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-redundant-condition.shader_test b/tests/shaders/glsl-fs-loop-redundant-condition.shader_test index e6f178ce3..6a177f2ef 100644 --- a/tests/shaders/glsl-fs-loop-redundant-condition.shader_test +++ b/tests/shaders/glsl-fs-loop-redundant-condition.shader_test @@ -2,8 +2,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-two-counter-01.shader_test b/tests/shaders/glsl-fs-loop-two-counter-01.shader_test index 793c07e01..1a5f82a5e 100644 --- a/tests/shaders/glsl-fs-loop-two-counter-01.shader_test +++ b/tests/shaders/glsl-fs-loop-two-counter-01.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-two-counter-02.shader_test b/tests/shaders/glsl-fs-loop-two-counter-02.shader_test index 888e13367..7bcc5f921 100644 --- a/tests/shaders/glsl-fs-loop-two-counter-02.shader_test +++ b/tests/shaders/glsl-fs-loop-two-counter-02.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-two-counter-03.shader_test b/tests/shaders/glsl-fs-loop-two-counter-03.shader_test index 5a255af75..49d8f6143 100644 --- a/tests/shaders/glsl-fs-loop-two-counter-03.shader_test +++ b/tests/shaders/glsl-fs-loop-two-counter-03.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-two-counter-04.shader_test b/tests/shaders/glsl-fs-loop-two-counter-04.shader_test index d7e0e2d34..61d65a493 100644 --- a/tests/shaders/glsl-fs-loop-two-counter-04.shader_test +++ b/tests/shaders/glsl-fs-loop-two-counter-04.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-fs-loop-zero-iter.shader_test b/tests/shaders/glsl-fs-loop-zero-iter.shader_test index dfdcdbc47..91ccf0f80 100644 --- a/tests/shaders/glsl-fs-loop-zero-iter.shader_test +++ b/tests/shaders/glsl-fs-loop-zero-iter.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] /* Verify that a zero-iteration loop is not executed. See also diff --git a/tests/shaders/glsl-fs-mod.shader_test b/tests/shaders/glsl-fs-mod.shader_test index 8bf327751..4e2350291 100644 --- a/tests/shaders/glsl-fs-mod.shader_test +++ b/tests/shaders/glsl-fs-mod.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] uniform vec4 arg0; diff --git a/tests/shaders/glsl-fs-neg.shader_test b/tests/shaders/glsl-fs-neg.shader_test index 770969e9c..1d8aa817f 100644 --- a/tests/shaders/glsl-fs-neg.shader_test +++ b/tests/shaders/glsl-fs-neg.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] uniform vec4 color; diff --git a/tests/shaders/glsl-fs-sign.shader_test b/tests/shaders/glsl-fs-sign.shader_test index a0709c02e..fb547c1c8 100644 --- a/tests/shaders/glsl-fs-sign.shader_test +++ b/tests/shaders/glsl-fs-sign.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] uniform vec4 arg0; diff --git a/tests/shaders/glsl-fs-step.shader_test b/tests/shaders/glsl-fs-step.shader_test index b71783514..c63b6051b 100644 --- a/tests/shaders/glsl-fs-step.shader_test +++ b/tests/shaders/glsl-fs-step.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] uniform vec4 arg0, arg1; diff --git a/tests/shaders/glsl-fs-unroll-out-param.shader_test b/tests/shaders/glsl-fs-unroll-out-param.shader_test index 7cbaa23fe..6bbc650c8 100644 --- a/tests/shaders/glsl-fs-unroll-out-param.shader_test +++ b/tests/shaders/glsl-fs-unroll-out-param.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void foo(out int i) diff --git a/tests/shaders/glsl-fs-unroll-side-effect.shader_test b/tests/shaders/glsl-fs-unroll-side-effect.shader_test index af9c1b7cf..78d804d96 100644 --- a/tests/shaders/glsl-fs-unroll-side-effect.shader_test +++ b/tests/shaders/glsl-fs-unroll-side-effect.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] int i = 0; diff --git a/tests/shaders/glsl-implicit-conversion-01.shader_test b/tests/shaders/glsl-implicit-conversion-01.shader_test index f2d2e21cd..cf99fc680 100644 --- a/tests/shaders/glsl-implicit-conversion-01.shader_test +++ b/tests/shaders/glsl-implicit-conversion-01.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] #version 120 diff --git a/tests/shaders/glsl-inexact-overloads.shader_test b/tests/shaders/glsl-inexact-overloads.shader_test index e578de59d..6a6b20bc5 100644 --- a/tests/shaders/glsl-inexact-overloads.shader_test +++ b/tests/shaders/glsl-inexact-overloads.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.20 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] #version 120 diff --git a/tests/shaders/glsl-mat-from-int-ctor-01.shader_test b/tests/shaders/glsl-mat-from-int-ctor-01.shader_test index 727a719c6..80d34b02e 100644 --- a/tests/shaders/glsl-mat-from-int-ctor-01.shader_test +++ b/tests/shaders/glsl-mat-from-int-ctor-01.shader_test @@ -24,8 +24,11 @@ void main() gl_FrontColor = vec4(1.0, 0.0, 0.0, 1.0); } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] clear color 0.0 0.0 0.0 0.0 diff --git a/tests/shaders/glsl-mat-from-int-ctor-02.shader_test b/tests/shaders/glsl-mat-from-int-ctor-02.shader_test index b14e4278a..5b9938b23 100644 --- a/tests/shaders/glsl-mat-from-int-ctor-02.shader_test +++ b/tests/shaders/glsl-mat-from-int-ctor-02.shader_test @@ -15,8 +15,11 @@ void main() gl_FrontColor = vec4(1.0, 0.0, 0.0, 1.0); } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] clear color 0.0 0.0 0.0 0.0 diff --git a/tests/shaders/glsl-mat-from-int-ctor-03.shader_test b/tests/shaders/glsl-mat-from-int-ctor-03.shader_test index 350456213..a379893a2 100644 --- a/tests/shaders/glsl-mat-from-int-ctor-03.shader_test +++ b/tests/shaders/glsl-mat-from-int-ctor-03.shader_test @@ -21,8 +21,11 @@ void main() gl_FrontColor = vec4(1.0, 0.0, 0.0, 1.0); } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] clear color 0.0 0.0 0.0 0.0 diff --git a/tests/shaders/glsl-mat-from-vec-ctor-01.shader_test b/tests/shaders/glsl-mat-from-vec-ctor-01.shader_test index 303d0ba49..f331cb1a7 100644 --- a/tests/shaders/glsl-mat-from-vec-ctor-01.shader_test +++ b/tests/shaders/glsl-mat-from-vec-ctor-01.shader_test @@ -23,8 +23,11 @@ void main() gl_FrontColor = m * d; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] uniform vec4 a 1.0 0.0 0.0 0.3 diff --git a/tests/shaders/glsl-override-builtin-2.shader_test b/tests/shaders/glsl-override-builtin-2.shader_test index 83f89b220..2a8001ad0 100644 --- a/tests/shaders/glsl-override-builtin-2.shader_test +++ b/tests/shaders/glsl-override-builtin-2.shader_test @@ -5,8 +5,11 @@ GLSL >= 1.10 another shader. */ -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] float myfunc(float); diff --git a/tests/shaders/glsl-override-builtin.shader_test b/tests/shaders/glsl-override-builtin.shader_test index e831a0046..d78c887f9 100644 --- a/tests/shaders/glsl-override-builtin.shader_test +++ b/tests/shaders/glsl-override-builtin.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] int exp2(int x) diff --git a/tests/shaders/glsl-pp-elif-no-expression-1.shader_test b/tests/shaders/glsl-pp-elif-no-expression-1.shader_test index 7b97ee7d2..e9de44de6 100644 --- a/tests/shaders/glsl-pp-elif-no-expression-1.shader_test +++ b/tests/shaders/glsl-pp-elif-no-expression-1.shader_test @@ -1,8 +1,11 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-mvp.vert +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} [fragment shader] void main() diff --git a/tests/shaders/glsl-vs-constructor-call.shader_test b/tests/shaders/glsl-vs-constructor-call.shader_test index 95878f1cb..5c2dd00bd 100644 --- a/tests/shaders/glsl-vs-constructor-call.shader_test +++ b/tests/shaders/glsl-vs-constructor-call.shader_test @@ -26,8 +26,11 @@ void main() gl_Position = gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] draw rect -1 -1 2 2 diff --git a/tests/shaders/glsl-vs-if-greater-equal.shader_test b/tests/shaders/glsl-vs-if-greater-equal.shader_test index 2954ec7d8..c6810bb3f 100644 --- a/tests/shaders/glsl-vs-if-greater-equal.shader_test +++ b/tests/shaders/glsl-vs-if-greater-equal.shader_test @@ -11,8 +11,11 @@ void main() gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-if-greater.shader_test b/tests/shaders/glsl-vs-if-greater.shader_test index 03e1047cc..dfa7501b0 100644 --- a/tests/shaders/glsl-vs-if-greater.shader_test +++ b/tests/shaders/glsl-vs-if-greater.shader_test @@ -11,8 +11,11 @@ void main() gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-if-less-equal.shader_test b/tests/shaders/glsl-vs-if-less-equal.shader_test index b0497f4ea..e39c06d00 100644 --- a/tests/shaders/glsl-vs-if-less-equal.shader_test +++ b/tests/shaders/glsl-vs-if-less-equal.shader_test @@ -11,8 +11,11 @@ void main() gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-if-less.shader_test b/tests/shaders/glsl-vs-if-less.shader_test index 2cb5e3baa..3d1523cf6 100644 --- a/tests/shaders/glsl-vs-if-less.shader_test +++ b/tests/shaders/glsl-vs-if-less.shader_test @@ -11,8 +11,11 @@ void main() gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-if-nested.shader_test b/tests/shaders/glsl-vs-if-nested.shader_test index 4bd90831a..2e79508f4 100644 --- a/tests/shaders/glsl-vs-if-nested.shader_test +++ b/tests/shaders/glsl-vs-if-nested.shader_test @@ -22,8 +22,11 @@ void main() gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-large-uniform-array.shader_test b/tests/shaders/glsl-vs-large-uniform-array.shader_test index a11c26088..49c14df03 100644 --- a/tests/shaders/glsl-vs-large-uniform-array.shader_test +++ b/tests/shaders/glsl-vs-large-uniform-array.shader_test @@ -10,8 +10,11 @@ void main() gl_FrontColor = array[0] + array[340] + array[473] - vec4(1, 0, 1, 0); } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test b/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test index 093942c34..64ac072f3 100644 --- a/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test +++ b/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test @@ -10,8 +10,11 @@ void main() gl_Position = gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] draw rect -1 -1 2 2 diff --git a/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test b/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test index 1858d25f5..6931b8126 100644 --- a/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test +++ b/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test @@ -9,8 +9,11 @@ void main() gl_Position = gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] draw rect -1 -1 2 2 diff --git a/tests/shaders/glsl-vs-vec4-indexing-1.shader_test b/tests/shaders/glsl-vs-vec4-indexing-1.shader_test index 5824f047f..3304b1590 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-1.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-1.shader_test @@ -15,8 +15,11 @@ void main() gl_Position = gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] draw rect -1 -1 2 2 diff --git a/tests/shaders/glsl-vs-vec4-indexing-2.shader_test b/tests/shaders/glsl-vs-vec4-indexing-2.shader_test index 154c0c665..8da2032ec 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-2.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-2.shader_test @@ -14,8 +14,11 @@ void main() gl_Position = gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] uniform float i 2.0; diff --git a/tests/shaders/glsl-vs-vec4-indexing-3.shader_test b/tests/shaders/glsl-vs-vec4-indexing-3.shader_test index 85cb7775a..4ea7bf63f 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-3.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-3.shader_test @@ -13,8 +13,11 @@ void main() gl_Position = gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] uniform float i 1.0; diff --git a/tests/shaders/glsl-vs-vec4-indexing-4.shader_test b/tests/shaders/glsl-vs-vec4-indexing-4.shader_test index a5b125056..c25ef866d 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-4.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-4.shader_test @@ -17,8 +17,11 @@ void main() gl_Position = gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] draw rect -1 -1 2 2 diff --git a/tests/shaders/glsl-vs-vec4-indexing-5.shader_test b/tests/shaders/glsl-vs-vec4-indexing-5.shader_test index 9a22a0d6c..4b795b9fe 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-5.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-5.shader_test @@ -18,8 +18,11 @@ void main() gl_Position = gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] uniform vec4 val 0.0 0.0 1.0 0.0 diff --git a/tests/shaders/glsl-vs-vec4-indexing-6.shader_test b/tests/shaders/glsl-vs-vec4-indexing-6.shader_test index 17b4347cf..f43f1da80 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-6.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-6.shader_test @@ -10,8 +10,11 @@ void main() gl_Position = gl_Vertex; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] uniform vec4 val 0.0 0.0 0.5 0.0 diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-loop.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-loop.shader_test index 77d6e6adb..0a92e527e 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-loop.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-loop.shader_test @@ -25,8 +25,11 @@ void main() array[4] + array[5] + array[6] + array[7]; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test index 54f8b6810..ab214f0f6 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test @@ -28,8 +28,11 @@ void main() array[5] + array[6] + array[7] + array[8] + array[9] + array[10]; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-dst.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-dst.shader_test index f5c93e09a..a11b93f1b 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-dst.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-dst.shader_test @@ -18,8 +18,11 @@ void main() gl_FrontColor = array[0] + array[1] + array[2] + array[3]; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-loop.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-loop.shader_test index b8bc3c96d..bad074017 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-loop.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-loop.shader_test @@ -23,8 +23,11 @@ void main() gl_FrontColor = res; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test index bd29f9eb8..e9716e5d5 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test @@ -27,8 +27,11 @@ void main() gl_FrontColor = res; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test index a2e28b08d..b393300dd 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test @@ -24,8 +24,11 @@ void main() gl_FrontColor = res; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test index 8ae9e90c8..a7c6602f9 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test @@ -24,8 +24,11 @@ void main() gl_FrontColor = res; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src.shader_test index 26e375e4f..f9387c62d 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src.shader_test @@ -21,8 +21,11 @@ void main() gl_FrontColor = array[index]; } -[fragment shader file] -glsl-color.frag +[fragment shader] +void main() +{ + gl_FragColor = gl_Color; +} [test] ortho diff --git a/tests/shaders/loopfunc.shader_test b/tests/shaders/loopfunc.shader_test index f1e1f08eb..f37f4eaa1 100644 --- a/tests/shaders/loopfunc.shader_test +++ b/tests/shaders/loopfunc.shader_test @@ -1,31 +1,31 @@ -[require]
-GL >= 2.0
-GLSL >= 1.10
-
-[vertex shader]
-bool myFunc(void)
-{
- int i;
- for(i = 0; i < 2; i++)
- {
- if(i < 1)
- return true;
- else
- return false;
- }
-}
-
-void main(void)
-{
- if (myFunc())
- gl_FrontColor = vec4(0.0, 1.0, 0.0, 1.0); // green
- else
- gl_FrontColor = vec4(1.0, 0.0, 0.0, 1.0); // red
-
- gl_Position = gl_Vertex;
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgba 0.0 1.0 0.0 1.0
-
+[require] +GL >= 2.0 +GLSL >= 1.10 + +[vertex shader] +bool myFunc(void) +{ + int i; + for(i = 0; i < 2; i++) + { + if(i < 1) + return true; + else + return false; + } +} + +void main(void) +{ + if (myFunc()) + gl_FrontColor = vec4(0.0, 1.0, 0.0, 1.0); // green + else + gl_FrontColor = vec4(1.0, 0.0, 0.0, 1.0); // red + + gl_Position = gl_Vertex; +} + +[test] +draw rect -1 -1 2 2 +probe all rgba 0.0 1.0 0.0 1.0 + diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-01.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-01.shader_test index 9636f9e91..b2289b347 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-01.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-01.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert +[vertex shader] +varying vec4 texcoord; -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-02.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-02.shader_test index 9b5978185..fe1261fb6 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-02.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-02.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert +[vertex shader] +varying vec4 texcoord; -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-03.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-03.shader_test index 335c5d57a..0ff5afb8a 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-03.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-03.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert +[vertex shader] +varying vec4 texcoord; -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-04.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-04.shader_test index 2c1caa9c6..33082d1ae 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-04.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-04.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert +[vertex shader] +varying vec4 texcoord; -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-05.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-05.shader_test index 93b0d53c6..b725618bb 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-05.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-05.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert +[vertex shader] +varying vec4 texcoord; -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-06.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-06.shader_test index 7bd89fa98..594136bfb 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-06.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-06.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert +[vertex shader] +varying vec4 texcoord; -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-07.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-07.shader_test index beefc39ab..4c0380219 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-07.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-07.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert +[vertex shader] +varying vec4 texcoord; -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-08.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-08.shader_test index a176079ef..bb629c5dd 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-08.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-08.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert +[vertex shader] +varying vec4 texcoord; -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-09.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-09.shader_test index c370b386f..899e76c85 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-09.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-09.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert +[vertex shader] +varying vec4 texcoord; -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-cumulative.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-cumulative.shader_test index 147c14ba5..a64d1be00 100644 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-cumulative.shader_test +++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-cumulative.shader_test @@ -10,11 +10,26 @@ GLSL >= 1.10 GL_ARB_shader_texture_lod -[vertex shader file] -glsl-fs-shadow2DGradARB.vert - -[fragment shader file] -glsl-fs-shadow2DGradARB.frag +[vertex shader] +varying vec4 texcoord; + +void main() +{ + gl_Position = gl_Vertex; + texcoord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#extension GL_ARB_shader_texture_lod : require + +uniform sampler2DShadow tex; +varying vec4 texcoord; + +void main() +{ + gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, + dFdx(texcoord.xy), dFdy(texcoord.xy)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB.frag b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB.frag deleted file mode 100644 index 1383d2344..000000000 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB.frag +++ /dev/null @@ -1,10 +0,0 @@ -#extension GL_ARB_shader_texture_lod : require - -uniform sampler2DShadow tex; -varying vec4 texcoord; - -void main() -{ - gl_FragColor = shadow2DGradARB(tex, texcoord.xyy, - dFdx(texcoord.xy), dFdy(texcoord.xy)); -} diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB.vert b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB.vert deleted file mode 100644 index 97041f6e7..000000000 --- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB.vert +++ /dev/null @@ -1,7 +0,0 @@ -varying vec4 texcoord; - -void main() -{ - gl_Position = gl_Vertex; - texcoord = (gl_Vertex + 1.0) / 2.0; -} diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow.vert b/tests/spec/arb_texture_rectangle/glsl-fs-shadow.vert deleted file mode 100644 index 49de64276..000000000 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow.vert +++ /dev/null @@ -1,8 +0,0 @@ -#version 110 - -varying vec4 texcoords; - -void main() { - gl_Position = gl_Vertex; - texcoords = (gl_Vertex + 1.0) / 2.0; -} diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-01.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-01.shader_test index 123a563de..8dbcaead0 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-01.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-01.shader_test @@ -7,11 +7,25 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DRect.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DRectShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-02.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-02.shader_test index 3592d33c4..6f3ba2b7a 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-02.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-02.shader_test @@ -7,11 +7,25 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DRect.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DRectShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-03.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-03.shader_test index 7952aecd8..90f29f645 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-03.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-03.shader_test @@ -7,11 +7,25 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DRect.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DRectShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-04.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-04.shader_test index ea5b7e665..2448e966c 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-04.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-04.shader_test @@ -7,11 +7,25 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DRect.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DRectShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-05.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-05.shader_test index 1ebf0a06d..a100ec0d5 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-05.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-05.shader_test @@ -7,11 +7,25 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DRect.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DRectShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-06.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-06.shader_test index 95d1df51f..65d064471 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-06.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-06.shader_test @@ -7,11 +7,25 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DRect.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DRectShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-07.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-07.shader_test index 457f9a04c..714e4a2a7 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-07.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-07.shader_test @@ -7,11 +7,25 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DRect.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DRectShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-08.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-08.shader_test index a4cafae74..176817747 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-08.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-08.shader_test @@ -7,11 +7,25 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DRect.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DRectShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-09.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-09.shader_test index 9f1806dc5..e09dd24b9 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-09.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect-09.shader_test @@ -7,11 +7,25 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DRect.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DRectShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.frag b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.frag deleted file mode 100644 index 73e95f250..000000000 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.frag +++ /dev/null @@ -1,8 +0,0 @@ -#version 110 - -uniform sampler2DRectShadow tex; -varying vec4 texcoords; - -void main() { - gl_FragColor = shadow2DRect(tex, texcoords.xyy * vec3(31.0, 31.0, 1.0)); -} diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.shader_test index cbba69dcc..12489bb35 100644 --- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.shader_test +++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.shader_test @@ -2,8 +2,15 @@ GLSL >= 1.10 GL_ARB_texture_rectangle -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 + +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} [fragment shader] varying vec4 texcoords; diff --git a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-01.shader_test b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-01.shader_test index e0070dd3d..be0b61c42 100644 --- a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-01.shader_test +++ b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-01.shader_test @@ -14,11 +14,25 @@ GLSL >= 1.10 GL_ARB_texture_rg -[vertex shader file] -fs-shadow2d.vert +[vertex shader] +#version 110 -[fragment shader file] -fs-shadow2d.frag +varying vec4 tex_coord; + +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 tex_coord; + +void main() { + gl_FragColor = shadow2D(tex, tex_coord.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-02.shader_test b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-02.shader_test index 93dc33ff9..bc2045f1b 100644 --- a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-02.shader_test +++ b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-02.shader_test @@ -14,11 +14,25 @@ GLSL >= 1.10 GL_ARB_texture_rg -[vertex shader file] -fs-shadow2d.vert +[vertex shader] +#version 110 -[fragment shader file] -fs-shadow2d.frag +varying vec4 tex_coord; + +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 tex_coord; + +void main() { + gl_FragColor = shadow2D(tex, tex_coord.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-03.shader_test b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-03.shader_test index c6937047f..258b6669c 100644 --- a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-03.shader_test +++ b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-03.shader_test @@ -14,11 +14,25 @@ GLSL >= 1.10 GL_ARB_texture_rg -[vertex shader file] -fs-shadow2d.vert +[vertex shader] +#version 110 -[fragment shader file] -fs-shadow2d.frag +varying vec4 tex_coord; + +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 tex_coord; + +void main() { + gl_FragColor = shadow2D(tex, tex_coord.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/arb_texture_rg/execution/fs-shadow2d.frag b/tests/spec/arb_texture_rg/execution/fs-shadow2d.frag deleted file mode 100644 index 765f648d2..000000000 --- a/tests/spec/arb_texture_rg/execution/fs-shadow2d.frag +++ /dev/null @@ -1,8 +0,0 @@ -#version 110 - -uniform sampler2DShadow tex; -varying vec4 tex_coord; - -void main() { - gl_FragColor = shadow2D(tex, tex_coord.xyy); -} diff --git a/tests/spec/arb_texture_rg/execution/fs-shadow2d.vert b/tests/spec/arb_texture_rg/execution/fs-shadow2d.vert deleted file mode 100644 index 426e7b791..000000000 --- a/tests/spec/arb_texture_rg/execution/fs-shadow2d.vert +++ /dev/null @@ -1,8 +0,0 @@ -#version 110 - -varying vec4 tex_coord; - -void main() { - gl_Position = gl_Vertex; - tex_coord = (gl_Vertex + 1.0) / 2.0; -} diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow.vert b/tests/spec/ext_texture_array/glsl-fs-shadow.vert deleted file mode 100644 index 49de64276..000000000 --- a/tests/spec/ext_texture_array/glsl-fs-shadow.vert +++ /dev/null @@ -1,8 +0,0 @@ -#version 110 - -varying vec4 texcoords; - -void main() { - gl_Position = gl_Vertex; - texcoords = (gl_Vertex + 1.0) / 2.0; -} diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-01.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-01.shader_test index 68f6b3676..5671c3a4f 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-01.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-01.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler1DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-02.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-02.shader_test index 029f0c5f4..b5676eb6b 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-02.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-02.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler1DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-03.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-03.shader_test index 311ac76e8..e2b7e0ba2 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-03.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-03.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler1DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-04.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-04.shader_test index a33f27d35..0c2d23531 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-04.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-04.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler1DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-05.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-05.shader_test index 8e3724911..f2a9c01eb 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-05.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-05.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler1DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-06.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-06.shader_test index b81cf8243..bf5dc4f27 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-06.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-06.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler1DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-07.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-07.shader_test index 35de05b5d..75388c80c 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-07.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-07.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler1DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-08.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-08.shader_test index 4c902fbda..e1c0181c2 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-08.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-08.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler1DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-09.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-09.shader_test index 2a1446d34..5b0a3e8cd 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-09.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-09.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler1DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-bias.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-bias.shader_test index 2c42f571a..1f3f41e14 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-bias.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-bias.shader_test @@ -2,8 +2,15 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 + +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} [fragment shader] #version 110 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.frag b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.frag deleted file mode 100644 index e3d2fc588..000000000 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.frag +++ /dev/null @@ -1,9 +0,0 @@ -#version 110 -#extension GL_EXT_texture_array : enable - -uniform sampler1DArrayShadow tex; -varying vec4 texcoords; - -void main() { - gl_FragColor = shadow1DArray(tex, vec3(texcoords.x, 0.0, texcoords.y)); -} diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.shader_test index f908df341..1763a40a6 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.shader_test @@ -2,8 +2,15 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 + +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} [fragment shader] #version 110 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-01.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-01.shader_test index 86fc85ff9..5ea1a950b 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-01.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-01.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler2DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-02.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-02.shader_test index 02f752125..82fc928e6 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-02.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-02.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler2DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-03.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-03.shader_test index b5cd0fc6e..6cbce26dc 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-03.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-03.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler2DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-04.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-04.shader_test index eefbbd969..9d220a484 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-04.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-04.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler2DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-05.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-05.shader_test index 786e52c83..34077f97e 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-05.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-05.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler2DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-06.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-06.shader_test index 02d1283e1..de08f1782 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-06.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-06.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler2DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-07.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-07.shader_test index 9d44d0fb7..168290060 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-07.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-07.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler2DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-08.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-08.shader_test index b1b1a3868..99721e793 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-08.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-08.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler2DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-09.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-09.shader_test index 47baf68e1..077674699 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-09.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray-09.shader_test @@ -7,11 +7,26 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2DArray.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 +#extension GL_EXT_texture_array : enable + +uniform sampler2DArrayShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.frag b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.frag deleted file mode 100644 index b1b08e331..000000000 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.frag +++ /dev/null @@ -1,9 +0,0 @@ -#version 110 -#extension GL_EXT_texture_array : enable - -uniform sampler2DArrayShadow tex; -varying vec4 texcoords; - -void main() { - gl_FragColor = shadow2DArray(tex, vec4(texcoords.x, texcoords.y, 0.0, texcoords.y)); -} diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.shader_test index cd437a985..7549de0d4 100644 --- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.shader_test +++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.shader_test @@ -2,8 +2,15 @@ GLSL >= 1.10 GL_EXT_texture_array -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 + +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} [fragment shader] #version 110 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow.vert b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow.vert deleted file mode 100644 index 49de64276..000000000 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow.vert +++ /dev/null @@ -1,8 +0,0 @@ -#version 110 - -varying vec4 texcoords; - -void main() { - gl_Position = gl_Vertex; - texcoords = (gl_Vertex + 1.0) / 2.0; -} diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-01.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-01.shader_test index 7a3bc6e27..0cd639b47 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-01.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-01.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler1DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-02.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-02.shader_test index 14401535b..69f45e614 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-02.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-02.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler1DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-03.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-03.shader_test index 505b98936..33d1d2f57 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-03.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-03.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler1DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-04.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-04.shader_test index 3e341224a..7c0dbeef8 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-04.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-04.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler1DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-05.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-05.shader_test index b433907d9..e0df9d687 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-05.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-05.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler1DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-06.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-06.shader_test index e587d3c1e..c9bb39a6d 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-06.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-06.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler1DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-07.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-07.shader_test index 7e1795967..00017e869 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-07.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-07.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler1DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-08.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-08.shader_test index 3efafd92c..a3fa413c3 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-08.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-08.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler1DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-09.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-09.shader_test index a9f0b96ad..c51b448b3 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-09.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-09.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow1D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler1DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-bias.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-bias.shader_test index 060e0a063..e0652c96c 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-bias.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-bias.shader_test @@ -1,8 +1,15 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 + +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} [fragment shader] varying vec4 texcoords; diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.frag b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.frag deleted file mode 100644 index f32e98f09..000000000 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.frag +++ /dev/null @@ -1,8 +0,0 @@ -#version 110 - -uniform sampler1DShadow tex; -varying vec4 texcoords; - -void main() { - gl_FragColor = shadow1D(tex, vec3(texcoords.x, 0.0, texcoords.y)); -} diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.shader_test index edcb91d11..67a371efc 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.shader_test @@ -1,8 +1,15 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 + +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} [fragment shader] varying vec4 texcoords; diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-01.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-01.shader_test index b2a17cbf8..15dfc7495 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-01.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-01.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2D(tex, texcoords.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-02.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-02.shader_test index acd988031..398c42c02 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-02.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-02.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2D(tex, texcoords.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-03.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-03.shader_test index 792373c97..dd356c2f1 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-03.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-03.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2D(tex, texcoords.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-04.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-04.shader_test index 1742e28b5..1f066a6bd 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-04.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-04.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2D(tex, texcoords.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-05.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-05.shader_test index d226f8421..39440b8d0 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-05.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-05.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2D(tex, texcoords.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-06.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-06.shader_test index 7ef52c625..b14f821f1 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-06.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-06.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2D(tex, texcoords.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-07.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-07.shader_test index c8c9ecc0c..13685dc19 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-07.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-07.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2D(tex, texcoords.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-08.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-08.shader_test index 57985a125..e672c55ea 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-08.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-08.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2D(tex, texcoords.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-09.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-09.shader_test index 51904cfd5..7d8b4909d 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-09.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-09.shader_test @@ -6,11 +6,25 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 -[fragment shader file] -glsl-fs-shadow2D.frag +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} + +[fragment shader] +#version 110 + +uniform sampler2DShadow tex; +varying vec4 texcoords; + +void main() { + gl_FragColor = shadow2D(tex, texcoords.xyy); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-bias.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-bias.shader_test index 69035dc52..2c6fc3c91 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-bias.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-bias.shader_test @@ -1,8 +1,15 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 + +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} [fragment shader] varying vec4 texcoords; diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-clamp-z.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-clamp-z.shader_test index 0a5aee14a..802144309 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-clamp-z.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-clamp-z.shader_test @@ -10,8 +10,15 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 + +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} [fragment shader] uniform vec3 texcoords; diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.frag b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.frag deleted file mode 100644 index ab1babe7d..000000000 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.frag +++ /dev/null @@ -1,8 +0,0 @@ -#version 110 - -uniform sampler2DShadow tex; -varying vec4 texcoords; - -void main() { - gl_FragColor = shadow2D(tex, texcoords.xyy); -} diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.shader_test index 7f10bff85..95c65ff5f 100644 --- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.shader_test +++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.shader_test @@ -1,8 +1,15 @@ [require] GLSL >= 1.10 -[vertex shader file] -glsl-fs-shadow.vert +[vertex shader] +#version 110 + +varying vec4 texcoords; + +void main() { + gl_Position = gl_Vertex; + texcoords = (gl_Vertex + 1.0) / 2.0; +} [fragment shader] varying vec4 texcoords; diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-01.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-01.shader_test index ab3d8b3a4..94ed38e04 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-01.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-01.shader_test @@ -7,11 +7,23 @@ GLSL >= 1.30 GL_ARB_texture_rg -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-02.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-02.shader_test index 39aff5a5d..ad922504a 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-02.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-02.shader_test @@ -7,11 +7,23 @@ GLSL >= 1.30 GL_ARB_texture_rg -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-03.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-03.shader_test index 040127b5c..2776495ee 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-03.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-03.shader_test @@ -7,11 +7,23 @@ GLSL >= 1.30 GL_ARB_texture_rg -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-04.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-04.shader_test index 85c2fa889..144bafb7a 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-04.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-04.shader_test @@ -6,11 +6,23 @@ [require] GLSL >= 1.30 -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-05.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-05.shader_test index fea978d92..6ee0e7c02 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-05.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-05.shader_test @@ -6,11 +6,23 @@ [require] GLSL >= 1.30 -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-06.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-06.shader_test index edb17b77b..4aa9e8469 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-06.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-06.shader_test @@ -6,11 +6,23 @@ [require] GLSL >= 1.30 -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-07.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-07.shader_test index 547af8845..5eaf8bf18 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-07.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-07.shader_test @@ -6,11 +6,23 @@ [require] GLSL >= 1.30 -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-08.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-08.shader_test index 4c872baf4..9cf14629d 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-08.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-08.shader_test @@ -6,11 +6,23 @@ [require] GLSL >= 1.30 -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-09.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-09.shader_test index 208e2c111..cf93606a4 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-09.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-09.shader_test @@ -6,11 +6,23 @@ [require] GLSL >= 1.30 -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-10.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-10.shader_test index 297879485..563811d9b 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-10.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-10.shader_test @@ -6,11 +6,23 @@ [require] GLSL >= 1.30 -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-11.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-11.shader_test index 038bbbd4f..bd0ac5acf 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-11.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-11.shader_test @@ -6,11 +6,23 @@ [require] GLSL >= 1.30 -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-12.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-12.shader_test index ee7aedcc2..598147568 100644 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-12.shader_test +++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-12.shader_test @@ -6,11 +6,23 @@ [require] GLSL >= 1.30 -[vertex shader file] -fs-texture-sampler2dshadow.vert +[vertex shader] +#version 130 +out vec4 tex_coord; +void main() { + gl_Position = gl_Vertex; + tex_coord = (gl_Vertex + 1.0) / 2.0; +} -[fragment shader file] -fs-texture-sampler2dshadow.frag +[fragment shader] +#version 130 +const float canary = 0.125; +uniform sampler2DShadow tex; +in vec4 tex_coord; +void main() { + float s = texture(tex, tex_coord.xyy); + gl_FragColor = vec4(s, canary, canary, canary); +} [test] uniform int tex 0 diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow.frag b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow.frag deleted file mode 100644 index e6763d23f..000000000 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow.frag +++ /dev/null @@ -1,8 +0,0 @@ -#version 130 -const float canary = 0.125; -uniform sampler2DShadow tex; -in vec4 tex_coord; -void main() { - float s = texture(tex, tex_coord.xyy); - gl_FragColor = vec4(s, canary, canary, canary); -} diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow.vert b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow.vert deleted file mode 100644 index bb6661d9d..000000000 --- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow.vert +++ /dev/null @@ -1,6 +0,0 @@ -#version 130 -out vec4 tex_coord; -void main() { - gl_Position = gl_Vertex; - tex_coord = (gl_Vertex + 1.0) / 2.0; -} |