From 7f9813d4b3cf60563db602414f6e49abdd634ab2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 28 May 2020 22:44:52 +0200
Subject: 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(-)

(limited to 'wgpu/src')

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 b3025a93..7059b51b 100644
Binary files a/wgpu/src/shader/quad.vert.spv and b/wgpu/src/shader/quad.vert.spv differ
-- 
cgit