Merge pull request #24 from wlrfx/wlroots-0.17-rebase

Rebase to wlroots 0.17

1 files changed, 5 insertions, 4 deletions

diff --git a/render/fx_renderer/gles2/shaders/common.vert b/render/fx_renderer/gles2/shaders/common.vert
index 811e0f2..9e7b073 100644
--- a/render/fx_renderer/gles2/shaders/common.vert
+++ b/render/fx_renderer/gles2/shaders/common.vert
@@ -1,12 +1,13 @@
 uniform mat3 proj;
 uniform vec4 color;
+uniform mat3 tex_proj;
 attribute vec2 pos;
-attribute vec2 texcoord;
 varying vec4 v_color;
 varying vec2 v_texcoord;
 
 void main() {
-    gl_Position = vec4(proj * vec3(pos, 1.0), 1.0);
-    v_color = color;
-    v_texcoord = texcoord;
+	vec3 pos3 = vec3(pos, 1.0);
+	gl_Position = vec4(pos3 * proj, 1.0);
+	v_color = color;
+	v_texcoord = (pos3 * tex_proj).xy;
 }