Merge branch 'master' into feature/custom-styling

4 files changed, 25 insertions, 0 deletions

diff --git a/wgpu/src/shader/triangle.frag b/wgpu/src/shader/triangle.frag
new file mode 100644
index 00000000..e39c45e7
--- /dev/null
+++ b/wgpu/src/shader/triangle.frag
@@ -0,0 +1,8 @@
+#version 450
+
+layout(location = 0) in vec4 i_Color;
+layout(location = 0) out vec4 o_Color;
+
+void main() {
+    o_Color = i_Color;
+}
diff --git a/wgpu/src/shader/triangle.frag.spv b/wgpu/src/shader/triangle.frag.spv
new file mode 100644
index 00000000..11201872
--- /dev/null
+++ b/wgpu/src/shader/triangle.frag.spv
diff --git a/wgpu/src/shader/triangle.vert b/wgpu/src/shader/triangle.vert
new file mode 100644
index 00000000..fd86ecd6
--- /dev/null
+++ b/wgpu/src/shader/triangle.vert
@@ -0,0 +1,17 @@
+#version 450
+
+layout(location = 0) in vec2 i_Position;
+layout(location = 1) in vec4 i_Color;
+
+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);
+    o_Color = i_Color;
+}
diff --git a/wgpu/src/shader/triangle.vert.spv b/wgpu/src/shader/triangle.vert.spv
new file mode 100644
index 00000000..bc39c451
--- /dev/null
+++ b/wgpu/src/shader/triangle.vert.spv