diff options
author | Péter Diviánszky <divipp@gmail.com> | 2016-02-14 15:02:55 +0100 |
---|---|---|
committer | Péter Diviánszky <divipp@gmail.com> | 2016-02-14 15:02:55 +0100 |
commit | 34e78f10452d1a1628a85eab443a4a672fd44ec3 (patch) | |
tree | 56321512ba2cdc3f3f62395818fa5c2f8b9a17f4 /testdata/uniformparam03.out | |
parent | 87cefc9cacb9e82c4340c8552d9373175980faca (diff) |
refactoring
Diffstat (limited to 'testdata/uniformparam03.out')
-rw-r--r-- | testdata/uniformparam03.out | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/testdata/uniformparam03.out b/testdata/uniformparam03.out index be9f3748..1b5bf8ef 100644 --- a/testdata/uniformparam03.out +++ b/testdata/uniformparam03.out | |||
@@ -22,27 +22,29 @@ Pipeline | |||
22 | , vertexShader = | 22 | , vertexShader = |
23 | """ | 23 | """ |
24 | #version 330 core | 24 | #version 330 core |
25 | vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);} | 25 | vec4 texture2D(sampler2D s,vec2 uv) { |
26 | uniform mat4 MVP ; | 26 | return texture(s,uv); |
27 | in vec4 vi1 ; | 27 | } |
28 | flat out vec4 vo1 ; | 28 | uniform mat4 MVP; |
29 | in vec4 vi1; | ||
30 | flat out vec4 vo1; | ||
29 | void main() { | 31 | void main() { |
30 | gl_Position = (MVP) * (vi1); | 32 | gl_Position = (MVP) * (vi1); |
31 | vo1 = vi1; | 33 | vo1 = vi1; |
32 | } | 34 | } |
33 | |||
34 | """ | 35 | """ |
35 | , geometryShader = Nothing | 36 | , geometryShader = Nothing |
36 | , fragmentShader = | 37 | , fragmentShader = |
37 | """ | 38 | """ |
38 | #version 330 core | 39 | #version 330 core |
39 | vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);} | 40 | vec4 texture2D(sampler2D s,vec2 uv) { |
40 | flat in vec4 vo1 ; | 41 | return texture(s,uv); |
41 | out vec4 f0 ; | 42 | } |
43 | flat in vec4 vo1; | ||
44 | out vec4 f0; | ||
42 | void main() { | 45 | void main() { |
43 | f0 = vo1; | 46 | f0 = vo1; |
44 | } | 47 | } |
45 | |||
46 | """ | 48 | """ |
47 | } | 49 | } |
48 | ] | 50 | ] |