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/NewStyle.out | |
parent | 87cefc9cacb9e82c4340c8552d9373175980faca (diff) |
refactoring
Diffstat (limited to 'testdata/NewStyle.out')
-rw-r--r-- | testdata/NewStyle.out | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/testdata/NewStyle.out b/testdata/NewStyle.out index 70e7cdc5..34940a54 100644 --- a/testdata/NewStyle.out +++ b/testdata/NewStyle.out | |||
@@ -24,27 +24,29 @@ Pipeline | |||
24 | , vertexShader = | 24 | , vertexShader = |
25 | """ | 25 | """ |
26 | #version 330 core | 26 | #version 330 core |
27 | vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);} | 27 | vec4 texture2D(sampler2D s,vec2 uv) { |
28 | uniform mat4 MVP ; | 28 | return texture(s,uv); |
29 | in vec4 vi1 ; | 29 | } |
30 | smooth out vec4 vo1 ; | 30 | uniform mat4 MVP; |
31 | in vec4 vi1; | ||
32 | smooth out vec4 vo1; | ||
31 | void main() { | 33 | void main() { |
32 | gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0)); | 34 | gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0)); |
33 | vo1 = vi1; | 35 | vo1 = vi1; |
34 | } | 36 | } |
35 | |||
36 | """ | 37 | """ |
37 | , geometryShader = Nothing | 38 | , geometryShader = Nothing |
38 | , fragmentShader = | 39 | , fragmentShader = |
39 | """ | 40 | """ |
40 | #version 330 core | 41 | #version 330 core |
41 | vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);} | 42 | vec4 texture2D(sampler2D s,vec2 uv) { |
42 | smooth in vec4 vo1 ; | 43 | return texture(s,uv); |
43 | out vec4 f0 ; | 44 | } |
45 | smooth in vec4 vo1; | ||
46 | out vec4 f0; | ||
44 | void main() { | 47 | void main() { |
45 | f0 = vo1; | 48 | f0 = vo1; |
46 | } | 49 | } |
47 | |||
48 | """ | 50 | """ |
49 | } | 51 | } |
50 | ] | 52 | ] |