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/gfx04.out | |
parent | 87cefc9cacb9e82c4340c8552d9373175980faca (diff) |
refactoring
Diffstat (limited to 'testdata/gfx04.out')
-rw-r--r-- | testdata/gfx04.out | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/testdata/gfx04.out b/testdata/gfx04.out index b67504c5..68bb0e52 100644 --- a/testdata/gfx04.out +++ b/testdata/gfx04.out | |||
@@ -26,28 +26,30 @@ Pipeline | |||
26 | , vertexShader = | 26 | , vertexShader = |
27 | """ | 27 | """ |
28 | #version 330 core | 28 | #version 330 core |
29 | vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);} | 29 | vec4 texture2D(sampler2D s,vec2 uv) { |
30 | uniform mat4 MVP ; | 30 | return texture(s,uv); |
31 | in vec3 vi1 ; | 31 | } |
32 | in vec3 vi2 ; | 32 | uniform mat4 MVP; |
33 | smooth out vec4 vo1 ; | 33 | in vec3 vi1; |
34 | in vec3 vi2; | ||
35 | smooth out vec4 vo1; | ||
34 | void main() { | 36 | void main() { |
35 | gl_Position = (MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)); | 37 | gl_Position = (MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)); |
36 | vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,1.0); | 38 | vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,1.0); |
37 | } | 39 | } |
38 | |||
39 | """ | 40 | """ |
40 | , geometryShader = Nothing | 41 | , geometryShader = Nothing |
41 | , fragmentShader = | 42 | , fragmentShader = |
42 | """ | 43 | """ |
43 | #version 330 core | 44 | #version 330 core |
44 | vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);} | 45 | vec4 texture2D(sampler2D s,vec2 uv) { |
45 | smooth in vec4 vo1 ; | 46 | return texture(s,uv); |
46 | out vec4 f0 ; | 47 | } |
48 | smooth in vec4 vo1; | ||
49 | out vec4 f0; | ||
47 | void main() { | 50 | void main() { |
48 | f0 = (vo1) * (vec4 (1.0,1.4,1.0,0.6)); | 51 | f0 = (vo1) * (vec4 (1.0,1.4,1.0,0.6)); |
49 | } | 52 | } |
50 | |||
51 | """ | 53 | """ |
52 | } | 54 | } |
53 | ] | 55 | ] |