From 578ea4abb8a2dd0d53d7087322796bf9ad541b56 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 12 Feb 2020 08:49:42 +0100
Subject: Finish `clock` example

---
 wgpu/src/shader/triangle.vert     |   4 +---
 wgpu/src/shader/triangle.vert.spv | Bin 1468 -> 1256 bytes
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'wgpu/src/shader')

diff --git a/wgpu/src/shader/triangle.vert b/wgpu/src/shader/triangle.vert
index fd86ecd6..1f2c009b 100644
--- a/wgpu/src/shader/triangle.vert
+++ b/wgpu/src/shader/triangle.vert
@@ -7,11 +7,9 @@ layout(location = 0) out vec4 o_Color;
 
 layout (set = 0, binding = 0) uniform Globals {
     mat4 u_Transform;
-    float u_Scale;
 };
 
 void main() {
-    vec2 p_Position = i_Position * u_Scale;
-    gl_Position = u_Transform * vec4(p_Position, 0.0, 1.0);
+    gl_Position = u_Transform * vec4(i_Position, 0.0, 1.0);
     o_Color = i_Color;
 }
diff --git a/wgpu/src/shader/triangle.vert.spv b/wgpu/src/shader/triangle.vert.spv
index bc39c451..871f4f55 100644
Binary files a/wgpu/src/shader/triangle.vert.spv and b/wgpu/src/shader/triangle.vert.spv differ
-- 
cgit 


From dadae122533ae0916bebd04d6efab3de145263d4 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 15 Feb 2020 10:08:27 +0100
Subject: Implement MSAA for `triangle` pipeline in `iced_wgpu`

---
 wgpu/src/shader/blit.frag     |  12 ++++++++++++
 wgpu/src/shader/blit.frag.spv | Bin 0 -> 684 bytes
 wgpu/src/shader/blit.vert     |  26 ++++++++++++++++++++++++++
 wgpu/src/shader/blit.vert.spv | Bin 0 -> 1384 bytes
 wgpu/src/shader/image.vert    |  24 ------------------------
 5 files changed, 38 insertions(+), 24 deletions(-)
 create mode 100644 wgpu/src/shader/blit.frag
 create mode 100644 wgpu/src/shader/blit.frag.spv
 create mode 100644 wgpu/src/shader/blit.vert
 create mode 100644 wgpu/src/shader/blit.vert.spv
 delete mode 100644 wgpu/src/shader/image.vert

(limited to 'wgpu/src/shader')

diff --git a/wgpu/src/shader/blit.frag b/wgpu/src/shader/blit.frag
new file mode 100644
index 00000000..dfed960f
--- /dev/null
+++ b/wgpu/src/shader/blit.frag
@@ -0,0 +1,12 @@
+#version 450
+
+layout(location = 0) in vec2 v_Uv;
+
+layout(set = 0, binding = 0) uniform sampler u_Sampler;
+layout(set = 1, binding = 0) uniform texture2D u_Texture;
+
+layout(location = 0) out vec4 o_Color;
+
+void main() {
+    o_Color = texture(sampler2D(u_Texture, u_Sampler), v_Uv);
+}
diff --git a/wgpu/src/shader/blit.frag.spv b/wgpu/src/shader/blit.frag.spv
new file mode 100644
index 00000000..2c5638b5
Binary files /dev/null and b/wgpu/src/shader/blit.frag.spv differ
diff --git a/wgpu/src/shader/blit.vert b/wgpu/src/shader/blit.vert
new file mode 100644
index 00000000..1c081b9e
--- /dev/null
+++ b/wgpu/src/shader/blit.vert
@@ -0,0 +1,26 @@
+#version 450
+
+layout(location = 0) out vec2 o_Uv;
+
+const vec2 positions[6] = vec2[6](
+    vec2(-1.0, -1.0),
+    vec2(-1.0, 1.0),
+    vec2(1.0, 1.0),
+    vec2(-1.0, -1.0),
+    vec2(1.0, -1.0),
+    vec2(1.0, 1.0)
+);
+
+const vec2 uvs[6] = vec2[6](
+    vec2(0.0, 0.0),
+    vec2(0.0, 1.0),
+    vec2(1.0, 1.0),
+    vec2(0.0, 0.0),
+    vec2(1.0, 0.0),
+    vec2(1.0, 1.0)
+);
+
+void main() {
+    o_Uv = uvs[gl_VertexIndex];
+    gl_Position = vec4(positions[gl_VertexIndex], 0.0, 1.0);
+}
diff --git a/wgpu/src/shader/blit.vert.spv b/wgpu/src/shader/blit.vert.spv
new file mode 100644
index 00000000..ad697d48
Binary files /dev/null and b/wgpu/src/shader/blit.vert.spv differ
diff --git a/wgpu/src/shader/image.vert b/wgpu/src/shader/image.vert
deleted file mode 100644
index 688c2311..00000000
--- a/wgpu/src/shader/image.vert
+++ /dev/null
@@ -1,24 +0,0 @@
-#version 450
-
-layout(location = 0) in vec2 v_Pos;
-layout(location = 1) in vec2 i_Pos;
-layout(location = 2) in vec2 i_Scale;
-
-layout (set = 0, binding = 0) uniform Globals {
-    mat4 u_Transform;
-};
-
-layout(location = 0) out vec2 o_Uv;
-
-void main() {
-    o_Uv = v_Pos;
-
-    mat4 i_Transform = mat4(
-        vec4(i_Scale.x, 0.0, 0.0, 0.0),
-        vec4(0.0, i_Scale.y, 0.0, 0.0),
-        vec4(0.0, 0.0, 1.0, 0.0),
-        vec4(i_Pos, 0.0, 1.0)
-    );
-
-    gl_Position = u_Transform * i_Transform * vec4(v_Pos, 0.0, 1.0);
-}
-- 
cgit