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/shaders/glsl-pp-elif-no-expression-1.shader_test | |
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/shaders/glsl-pp-elif-no-expression-1.shader_test')
-rw-r--r-- | tests/shaders/glsl-pp-elif-no-expression-1.shader_test | 7 |
1 files changed, 5 insertions, 2 deletions
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() |