From 9f581d3648ddd8226e943f688ec1fc9924e95fee Mon Sep 17 00:00:00 2001
From: mcrcortex <18544518+MCRcortex@users.noreply.github.com>
Date: Sat, 10 Feb 2024 08:14:34 +1000
Subject: [PATCH] Fix vertex ingest

---
 .../assets/voxy/shaders/bakery/position_tex.fsh       |  1 +
 .../assets/voxy/shaders/bakery/position_tex.vsh       | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/assets/voxy/shaders/bakery/position_tex.fsh b/src/main/resources/assets/voxy/shaders/bakery/position_tex.fsh
index 340a9f9c..49b75758 100644
--- a/src/main/resources/assets/voxy/shaders/bakery/position_tex.fsh
+++ b/src/main/resources/assets/voxy/shaders/bakery/position_tex.fsh
@@ -2,6 +2,7 @@
 
 layout(location=0) uniform sampler2D tex;
 in vec2 texCoord;
+in flat uint metadata;
 out vec4 colour;
 void main() {
     colour = texture(tex, texCoord);
diff --git a/src/main/resources/assets/voxy/shaders/bakery/position_tex.vsh b/src/main/resources/assets/voxy/shaders/bakery/position_tex.vsh
index 104e2f87..21f8d4d7 100644
--- a/src/main/resources/assets/voxy/shaders/bakery/position_tex.vsh
+++ b/src/main/resources/assets/voxy/shaders/bakery/position_tex.vsh
@@ -1,15 +1,16 @@
 #version 430
 
-in vec3 pos;
-in vec4 _metadata;
-in vec2 uv;
+layout(location=0) in vec3 pos;
+layout(location=1) in vec4 _metadata;
+layout(location=2) in vec2 uv;
 
 layout(location=1) uniform mat4 transform;
 out vec2 texCoord;
+out flat uint metadata;
 
 void main() {
-    uvec4 metadata = uvec4(_metadata*255);
-    uint metadata = (metadata.r<<16)|(metadata.g<<8)|(metadata.b);
+    uvec4 meta = uvec4(_metadata*255);
+    metadata = (meta.r<<16)|(meta.g<<8)|(meta.b);
 
     gl_Position = transform * vec4(pos, 1.0);
     texCoord = uv;