MetzNet
/
roleplay
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved shader_src to shader

main
noah metz 2024-10-30 16:40:20 -06:00
parent 664095927e
commit 857655e926
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/Makefile
Unescape Escape View File

@ -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 SOURCES = src/main.c src/draw.c src/ui.c src/gpu.c lib/spng.c lib/vma.cpp
OBJECTS = $(addsuffix .o, $(basename $(SOURCES))) OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
VERT_SPV = $(addsuffix .vert.spv, $(basename $(wildcard shader_src/*.vert))) VERT_SPV = $(addsuffix .vert.spv, $(basename $(wildcard shader/*.vert)))
FRAG_SPV = $(addsuffix .frag.spv, $(basename $(wildcard shader_src/*.frag))) FRAG_SPV = $(addsuffix .frag.spv, $(basename $(wildcard shader/*.frag)))
COMP_SPV = $(addsuffix .comp.spv, $(basename $(wildcard shader_src/*.comp))) COMP_SPV = $(addsuffix .comp.spv, $(basename $(wildcard shader/*.comp)))
SPV_FILES = $(VERT_SPV) $(FRAG_SPV) $(COMP_SPV) SPV_FILES = $(VERT_SPV) $(FRAG_SPV) $(COMP_SPV)
EXTRA_DEBUG_REQUIREMENTS := EXTRA_DEBUG_REQUIREMENTS :=

0
client/shader_src/string.comp → client/shader/string.comp
Unescape Escape View File

0
client/shader_src/ui.frag → client/shader/ui.frag
Unescape Escape View File

0
client/shader_src/ui.vert → client/shader/ui.vert
Unescape Escape View File

0
client/shader_src/ui_common.glsl → client/shader/ui_common.glsl
Unescape Escape View File

6
client/src/ui.c
Unescape Escape View File

@ -61,7 +61,7 @@ VkResult create_ui_pipeline(
GraphicsPipeline* pipeline, GraphicsPipeline* pipeline,
ComputePipeline* compute) { ComputePipeline* compute) {
VkResult result; 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) { if(compute_shader == VK_NULL_HANDLE) {
return VK_ERROR_UNKNOWN; return VK_ERROR_UNKNOWN;
} }
@ -100,11 +100,11 @@ VkResult create_ui_pipeline(
return result; 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) { if(vert_shader == VK_NULL_HANDLE) {
return VK_ERROR_UNKNOWN; 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) { if(frag_shader == VK_NULL_HANDLE) {
return VK_ERROR_UNKNOWN; return VK_ERROR_UNKNOWN;
} }