From 857655e92658c0367f5ede75bd5d2cd8b1ed92c0 Mon Sep 17 00:00:00 2001
From: Noah Metz <noah@metznet.ca>
Date: Wed, 30 Oct 2024 16:40:20 -0600
Subject: [PATCH] Moved shader_src to shader

---
 client/Makefile                              | 6 +++---
 client/{shader_src => shader}/string.comp    | 0
 client/{shader_src => shader}/ui.frag        | 0
 client/{shader_src => shader}/ui.vert        | 0
 client/{shader_src => shader}/ui_common.glsl | 0
 client/src/ui.c                              | 6 +++---
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename client/{shader_src => shader}/string.comp (100%)
 rename client/{shader_src => shader}/ui.frag (100%)
 rename client/{shader_src => shader}/ui.vert (100%)
 rename client/{shader_src => shader}/ui_common.glsl (100%)

diff --git a/client/Makefile b/client/Makefile
index 8b3485b..d2cd396 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -4,9 +4,9 @@ LDFLAGS = -lfreetype -lz -lglfw -lvulkan -ldl -Xlinker -rpath -Xlinker /opt/home
 
 SOURCES = src/main.c src/draw.c src/ui.c src/gpu.c lib/spng.c lib/vma.cpp
 OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
-VERT_SPV = $(addsuffix .vert.spv, $(basename $(wildcard shader_src/*.vert)))
-FRAG_SPV = $(addsuffix .frag.spv, $(basename $(wildcard shader_src/*.frag)))
-COMP_SPV = $(addsuffix .comp.spv, $(basename $(wildcard shader_src/*.comp)))
+VERT_SPV = $(addsuffix .vert.spv, $(basename $(wildcard shader/*.vert)))
+FRAG_SPV = $(addsuffix .frag.spv, $(basename $(wildcard shader/*.frag)))
+COMP_SPV = $(addsuffix .comp.spv, $(basename $(wildcard shader/*.comp)))
 SPV_FILES = $(VERT_SPV) $(FRAG_SPV) $(COMP_SPV)
 
 EXTRA_DEBUG_REQUIREMENTS :=
diff --git a/client/shader_src/string.comp b/client/shader/string.comp
similarity index 100%
rename from client/shader_src/string.comp
rename to client/shader/string.comp
diff --git a/client/shader_src/ui.frag b/client/shader/ui.frag
similarity index 100%
rename from client/shader_src/ui.frag
rename to client/shader/ui.frag
diff --git a/client/shader_src/ui.vert b/client/shader/ui.vert
similarity index 100%
rename from client/shader_src/ui.vert
rename to client/shader/ui.vert
diff --git a/client/shader_src/ui_common.glsl b/client/shader/ui_common.glsl
similarity index 100%
rename from client/shader_src/ui_common.glsl
rename to client/shader/ui_common.glsl
diff --git a/client/src/ui.c b/client/src/ui.c
index 5bf1ad6..17e5ecd 100644
--- a/client/src/ui.c
+++ b/client/src/ui.c
@@ -61,7 +61,7 @@ VkResult create_ui_pipeline(
     GraphicsPipeline* pipeline,
     ComputePipeline* compute) {
   VkResult result;
-  VkShaderModule compute_shader = load_shader_file("shader_src/string.comp.spv", device);
+  VkShaderModule compute_shader = load_shader_file("shader/string.comp.spv", device);
   if(compute_shader == VK_NULL_HANDLE) {
     return VK_ERROR_UNKNOWN;
   }
@@ -100,11 +100,11 @@ VkResult create_ui_pipeline(
     return result;
   }
 
-  VkShaderModule vert_shader = load_shader_file("shader_src/ui.vert.spv", device);
+  VkShaderModule vert_shader = load_shader_file("shader/ui.vert.spv", device);
   if(vert_shader == VK_NULL_HANDLE) {
     return VK_ERROR_UNKNOWN;
   }
-  VkShaderModule frag_shader = load_shader_file("shader_src/ui.frag.spv", device);
+  VkShaderModule frag_shader = load_shader_file("shader/ui.frag.spv", device);
   if(frag_shader == VK_NULL_HANDLE) {
     return VK_ERROR_UNKNOWN;
   }