Merge branch 'cel-60-scaffold-vulkan' into cleanroom-vulkan

3 files changed, 20 insertions, 6 deletions

diff --git a/assets/shaders/triangle.frag b/assets/shaders/object.frag
index 44c1eb3..44c1eb3 100644
--- a/assets/shaders/triangle.frag
+++ b/assets/shaders/object.frag
diff --git a/assets/shaders/object.vert b/assets/shaders/object.vert
new file mode 100644
index 0000000..a5097d4
--- /dev/null
+++ b/assets/shaders/object.vert
@@ -0,0 +1,20 @@
+#version 450
+#extension GL_ARB_separate_shader_objects : enable
+
+layout(location = 0) in vec3 in_position;
+
+layout(set = 0, binding = 0) uniform global_object_uniform {
+  mat4 projection;
+  mat4 view;
+}
+global_ubo;
+
+layout(push_constant) uniform push_constants {
+  mat4 model;  // 64 bytes
+}
+u_push_constants;
+
+void main() {
+  gl_Position =
+      global_ubo.projection * global_ubo.view * u_push_constants.model * vec4(in_position, 1.0);
+}
\ No newline at end of file
diff --git a/assets/shaders/triangle.vert b/assets/shaders/triangle.vert
deleted file mode 100644
index f253d9b..0000000
--- a/assets/shaders/triangle.vert
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-#extension GL_ARB_separate_shader_objects : enable
-
-layout(location = 0) in vec3 in_position;
-
-void main() { gl_Position = vec4(in_position, 1.0); }
\ No newline at end of file