From f07e87a86e386ba0f65c5a1e962b6a90cfe26ced Mon Sep 17 00:00:00 2001
From: Omniscient <17525998+omnisci3nce@users.noreply.github.com>
Date: Sat, 30 Mar 2024 17:42:15 +1100
Subject: uniform with descriptor set. fix image_index being 4 when expoected
 to be 3

---
 assets/shaders/object.frag   |  6 ++++++
 assets/shaders/object.vert   | 12 ++++++++++++
 assets/shaders/triangle.frag | 10 ----------
 assets/shaders/triangle.vert | 11 -----------
 4 files changed, 18 insertions(+), 21 deletions(-)
 create mode 100644 assets/shaders/object.frag
 create mode 100644 assets/shaders/object.vert
 delete mode 100644 assets/shaders/triangle.frag
 delete mode 100644 assets/shaders/triangle.vert

(limited to 'assets')

diff --git a/assets/shaders/object.frag b/assets/shaders/object.frag
new file mode 100644
index 0000000..44c1eb3
--- /dev/null
+++ b/assets/shaders/object.frag
@@ -0,0 +1,6 @@
+#version 450
+#extension GL_ARB_separate_shader_objects : enable
+
+layout(location = 0) out vec4 out_colour;
+
+void main() { out_colour = vec4(1.0); }
\ No newline at end of file
diff --git a/assets/shaders/object.vert b/assets/shaders/object.vert
new file mode 100644
index 0000000..9aaefed
--- /dev/null
+++ b/assets/shaders/object.vert
@@ -0,0 +1,12 @@
+#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;
+
+void main() { gl_Position = global_ubo.projection * global_ubo.view * vec4(in_position, 1.0); }
\ No newline at end of file
diff --git a/assets/shaders/triangle.frag b/assets/shaders/triangle.frag
deleted file mode 100644
index 8455d04..0000000
--- a/assets/shaders/triangle.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 450
-#extension GL_ARB_separate_shader_objects : enable
-
-layout(location = 0) in vec3 in_position;
-
-layout(location = 0) out vec4 out_colour;
-
-void main() {
-  out_colour = vec4(in_position.r + 0.5, in_position.g + 0.5, in_position.b + 0.5, 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 e34112d..0000000
--- a/assets/shaders/triangle.vert
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 450
-#extension GL_ARB_separate_shader_objects : enable
-
-layout(location = 0) in vec3 in_position;
-
-layout(location = 0) out vec3 out_position;
-
-void main() {
-  gl_Position = vec4(in_position, 1.0);
-  out_position = in_position;
-}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2