diff options
author | Péter Diviánszky <divipp@gmail.com> | 2016-02-18 10:17:30 +0100 |
---|---|---|
committer | Péter Diviánszky <divipp@gmail.com> | 2016-02-18 10:17:30 +0100 |
commit | 30e482a72d6c83490ae7d4656de9bd01cc4ef499 (patch) | |
tree | 4190a01fda8d6ea5e876c3a29ca5cb9c4175dcad /testdata/gfx03.out | |
parent | c468af5fdba01215c117aa7637f10fe1acfcdb4d (diff) |
inline uniform variables
Diffstat (limited to 'testdata/gfx03.out')
-rw-r--r-- | testdata/gfx03.out | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/testdata/gfx03.out b/testdata/gfx03.out index 1462c801..3ea828c2 100644 --- a/testdata/gfx03.out +++ b/testdata/gfx03.out | |||
@@ -28,10 +28,8 @@ Pipeline | |||
28 | } | 28 | } |
29 | uniform mat4 MVP2; | 29 | uniform mat4 MVP2; |
30 | in vec3 vi1; | 30 | in vec3 vi1; |
31 | mat4 modelViewProj = MVP2; | ||
32 | void main() { | 31 | void main() { |
33 | gl_Position = (modelViewProj) * (vec4 | 32 | gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)); |
34 | ((vi1).x,(vi1).y,(vi1).z,1.0)); | ||
35 | } | 33 | } |
36 | """ | 34 | """ |
37 | , geometryShader = Nothing | 35 | , geometryShader = Nothing |
@@ -62,10 +60,8 @@ Pipeline | |||
62 | uniform mat4 MVP2; | 60 | uniform mat4 MVP2; |
63 | in vec3 vi1; | 61 | in vec3 vi1; |
64 | smooth out vec4 vo1; | 62 | smooth out vec4 vo1; |
65 | mat4 modelViewProj = MVP2; | ||
66 | void main() { | 63 | void main() { |
67 | gl_Position = (modelViewProj) * (vec4 | 64 | gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)); |
68 | ((vi1).x,(vi1).y,(vi1).z,1.0)); | ||
69 | vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0); | 65 | vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0); |
70 | } | 66 | } |
71 | """ | 67 | """ |
@@ -99,9 +95,8 @@ Pipeline | |||
99 | uniform mat4 MVP; | 95 | uniform mat4 MVP; |
100 | in vec4 vi1; | 96 | in vec4 vi1; |
101 | flat out vec4 vo1; | 97 | flat out vec4 vo1; |
102 | mat4 modelViewProj = MVP; | ||
103 | void main() { | 98 | void main() { |
104 | gl_Position = (modelViewProj) * (vi1); | 99 | gl_Position = (MVP) * (vi1); |
105 | vo1 = vi1; | 100 | vo1 = vi1; |
106 | } | 101 | } |
107 | """ | 102 | """ |