From 7f9813d4b3cf60563db602414f6e49abdd634ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 28 May 2020 22:44:52 +0200
Subject: [PATCH] Revert "Merge pull request #362 from
 hecrj/fix/target-quad-pixels"

This reverts commit 40501f630d8a5aa234ea23b7eaae37060e0e08a5, reversing
changes made to 5324eb10242a7dd33f5271dc6fc9eeb09eb2cb50.
---
 wgpu/src/shader/quad.vert     |  12 ++++++------
 wgpu/src/shader/quad.vert.spv | Bin 3348 -> 3372 bytes
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wgpu/src/shader/quad.vert b/wgpu/src/shader/quad.vert
index 11f95eeb..1d9a4fd2 100644
--- a/wgpu/src/shader/quad.vert
+++ b/wgpu/src/shader/quad.vert
@@ -21,14 +21,14 @@ layout(location = 4) out float o_BorderRadius;
 layout(location = 5) out float o_BorderWidth;
 
 void main() {
-    vec2 p_Pos = floor(i_Pos * u_Scale);
-    vec2 p_Scale = floor(i_Scale  * u_Scale);
+    vec2 p_Pos = i_Pos * u_Scale;
+    vec2 p_Scale = i_Scale  * u_Scale;
 
     mat4 i_Transform = mat4(
-        vec4(p_Scale.x, 0.0, 0.0, 0.0),
-        vec4(0.0, p_Scale.y, 0.0, 0.0),
+        vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0),
+        vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0),
         vec4(0.0, 0.0, 1.0, 0.0),
-        vec4(p_Pos, 0.0, 1.0)
+        vec4(p_Pos - vec2(0.5, 0.5), 0.0, 1.0)
     );
 
     o_Color = i_Color;
@@ -36,7 +36,7 @@ void main() {
     o_Pos = p_Pos;
     o_Scale = p_Scale;
     o_BorderRadius = i_BorderRadius * u_Scale;
-    o_BorderWidth = floor(i_BorderWidth * u_Scale);
+    o_BorderWidth = i_BorderWidth * u_Scale;
 
     gl_Position = u_Transform * i_Transform * vec4(v_Pos, 0.0, 1.0);
 }
diff --git a/wgpu/src/shader/quad.vert.spv b/wgpu/src/shader/quad.vert.spv
index b3025a93396f709bb29e9cee5ab8779873115751..7059b51bc4575638f541d299aa07e0a12e4f6599 100644
GIT binary patch
literal 3372
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

literal 3348
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
E0QIfsCIA2c