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/gfx05.out | |
parent | c468af5fdba01215c117aa7637f10fe1acfcdb4d (diff) |
inline uniform variables
Diffstat (limited to 'testdata/gfx05.out')
-rw-r--r-- | testdata/gfx05.out | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/testdata/gfx05.out b/testdata/gfx05.out index a06d0612..10c98bd1 100644 --- a/testdata/gfx05.out +++ b/testdata/gfx05.out | |||
@@ -81,10 +81,8 @@ Pipeline | |||
81 | } | 81 | } |
82 | uniform mat4 MVP2; | 82 | uniform mat4 MVP2; |
83 | in vec3 vi1; | 83 | in vec3 vi1; |
84 | mat4 modelViewProj = MVP2; | ||
85 | void main() { | 84 | void main() { |
86 | gl_Position = (modelViewProj) * (vec4 | 85 | gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)); |
87 | ((vi1).x,(vi1).y,(vi1).z,1.0)); | ||
88 | } | 86 | } |
89 | """ | 87 | """ |
90 | , geometryShader = Nothing | 88 | , geometryShader = Nothing |
@@ -115,10 +113,8 @@ Pipeline | |||
115 | uniform mat4 MVP2; | 113 | uniform mat4 MVP2; |
116 | in vec3 vi1; | 114 | in vec3 vi1; |
117 | smooth out vec4 vo1; | 115 | smooth out vec4 vo1; |
118 | mat4 modelViewProj = MVP2; | ||
119 | void main() { | 116 | void main() { |
120 | gl_Position = (modelViewProj) * (vec4 | 117 | gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)); |
121 | ((vi1).x,(vi1).y,(vi1).z,1.0)); | ||
122 | vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0); | 118 | vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0); |
123 | } | 119 | } |
124 | """ | 120 | """ |
@@ -155,9 +151,8 @@ Pipeline | |||
155 | in vec4 vi1; | 151 | in vec4 vi1; |
156 | in vec2 vi2; | 152 | in vec2 vi2; |
157 | smooth out vec2 vo1; | 153 | smooth out vec2 vo1; |
158 | mat4 modelViewProj = MVP; | ||
159 | void main() { | 154 | void main() { |
160 | gl_Position = (modelViewProj) * (vi1); | 155 | gl_Position = (MVP) * (vi1); |
161 | vo1 = vi2; | 156 | vo1 = vi2; |
162 | } | 157 | } |
163 | """ | 158 | """ |