diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-22 00:12:53 +0900 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-22 00:12:53 +0900 |
| commit | 6dd1a21fb7fbac03fb8343f5858c22185ca6c59e (patch) | |
| tree | d749f407a47fdc2b2e4fcfded79a039f0f437e91 /drivers/gles2/shaders/canvas.glsl | |
| parent | c5080e23b822766b99cebb18618ff3fa69f16beb (diff) | |
| parent | c6eabbbec5a9fec7a0d473fe67a544af3454c3d2 (diff) | |
Merge remote-tracking branch 'upstream/master' into x11-window-management
Diffstat (limited to 'drivers/gles2/shaders/canvas.glsl')
| -rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index 5a26f7321e..dc0af017d0 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -52,8 +52,10 @@ void main() { VERTEX_SHADER_CODE } +#if !defined(USE_WORLD_VEC) outvec = extra_matrix * outvec; outvec = modelview_matrix * outvec; +#endif #ifdef USE_PIXEL_SNAP @@ -61,15 +63,15 @@ VERTEX_SHADER_CODE #endif + gl_Position = projection_matrix * outvec; + #ifdef USE_LIGHTING - light_tex_pos.xy = light_matrix * outvec; + light_tex_pos.xy = light_matrix * gl_Position; light_tex_pos.zw=outvec.xy - light_matrix[4].xy; //likely wrong #endif - - gl_Position = projection_matrix * outvec; } [fragment] |