From 1f87446591e5fd732933a11262863a6d63c01336 Mon Sep 17 00:00:00 2001
From: David Gonzalez Martin <davidgm94.work@protonmail.com>
Date: Sat, 21 Dec 2024 21:17:27 -0600
Subject: [PATCH] Reorganize shader data layout

---
 bootstrap/shaders/font.frag | 17 ++++++++---------
 bootstrap/shaders/font.h    |  5 +++++
 bootstrap/shaders/font.vert | 17 ++++++++++-------
 3 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 bootstrap/shaders/font.h

diff --git a/bootstrap/shaders/font.frag b/bootstrap/shaders/font.frag
index d0bfc20..e3b3f82 100644
--- a/bootstrap/shaders/font.frag
+++ b/bootstrap/shaders/font.frag
@@ -1,22 +1,21 @@
 #version 450
 #extension GL_EXT_nonuniform_qualifier : require
 #extension GL_EXT_debug_printf : require
+#extension GL_GOOGLE_include_directive : require
 
-//shader input
-layout (location = 0) in vec4 in_color;
-layout (location = 1) in vec2 in_screen_uv;
-layout (location = 2) in flat uint texture_index;
+#include "font.h"
 
-//output write
-layout (location = 0) out vec4 out_frag_color;
+layout (location = 0) in flat uint texture_index;
+layout (location = 1) in FragmentShaderInput inputs;
+
+layout (location = 0) out vec4 color;
 
 layout(set = 0, binding = 0) uniform sampler2D textures[];
 
 void main() 
 {
     vec2 texture_size = textureSize(textures[nonuniformEXT(texture_index)], 0);
-    vec2 uv = vec2(in_screen_uv.x / texture_size.x, in_screen_uv.y / texture_size.y);
+    vec2 uv = vec2(inputs.uv.x / texture_size.x, inputs.uv.y / texture_size.y);
     vec4 sampled = texture(textures[nonuniformEXT(texture_index)], uv);
-    // debugPrintfEXT("In color: (%f, %f, %f, %f). Sampled: (%f, %f, %f, %f)\n", in_color.x, in_color.y, in_color.z, in_color.w, sampled.x, sampled.y, sampled.z, sampled.w);
-    out_frag_color = in_color * sampled;
+    color = inputs.color * sampled;
 }
diff --git a/bootstrap/shaders/font.h b/bootstrap/shaders/font.h
new file mode 100644
index 0000000..9bddf86
--- /dev/null
+++ b/bootstrap/shaders/font.h
@@ -0,0 +1,5 @@
+struct FragmentShaderInput
+{
+    vec4 color;
+    vec2 uv;
+};
diff --git a/bootstrap/shaders/font.vert b/bootstrap/shaders/font.vert
index 66d0ffb..6d49517 100644
--- a/bootstrap/shaders/font.vert
+++ b/bootstrap/shaders/font.vert
@@ -1,10 +1,12 @@
 #version 450
 #extension GL_EXT_buffer_reference : require
 #extension GL_EXT_debug_printf : require
+#extension GL_GOOGLE_include_directive : require
 
-layout (location = 0) out vec4 out_color;
-layout (location = 1) out vec2 out_uv;
-layout (location = 2) out uint out_texture_index;
+#include "font.h"
+
+layout (location = 0) out uint texture_index;
+layout (location = 1) out FragmentShaderInput outputs;
 
 struct Vertex {
     float x;
@@ -34,11 +36,12 @@ void main()
     float width = PushConstants.width;
     float height = PushConstants.height;
 
-    //output data
     gl_Position = vec4(2 * v.x / width - 1, 2 * v.y / height - 1, 0, 1);
-    out_uv = vec2(v.uv_x, v.uv_y);
-    out_color = v.colors[gl_VertexIndex % 4];
-    out_texture_index = v.texture_index;
+
+    outputs.uv = vec2(v.uv_x, v.uv_y);
+    outputs.color = v.colors[gl_VertexIndex % 4];
+    texture_index = v.texture_index;
+
     //debugPrintfEXT("Vertex index: (%u)\n", gl_VertexIndex);
     //debugPrintfEXT("UV: (%f, %f)\n", v.uv_x, v.uv_y);
 }