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

---
 xmake.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'xmake.lua')

diff --git a/xmake.lua b/xmake.lua
index 3005713..cb6d98a 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -69,7 +69,7 @@ rule("compile_glsl_vert_shaders")
     on_buildcmd_file(function (target, batchcmds, sourcefile, opt) 
         local targetfile = path.join(target:targetdir(), path.basename(sourcefile) .. ".vert.spv")
         
-        print("Compiling shader: %s", sourcefile)
+        print("Compiling shader: %s to %s", sourcefile, targetfile)
         batchcmds:vrunv('glslc', {sourcefile, "-o", targetfile})
         batchcmds:add_depfiles(sourcefile)
 end)
@@ -78,7 +78,7 @@ rule("compile_glsl_frag_shaders")
     on_buildcmd_file(function (target, batchcmds, sourcefile, opt) 
         local targetfile = path.join(target:targetdir(), path.basename(sourcefile) .. ".frag.spv")
         
-        print("Compiling shader: %s", sourcefile)
+        print("Compiling shader: %s to %s", sourcefile, targetfile)
         batchcmds:vrunv('glslc', {sourcefile, "-o", targetfile})
         batchcmds:add_depfiles(sourcefile)
 end)
@@ -104,11 +104,11 @@ target("core_config")
     add_includedirs("src/std/", {public = true})
     add_includedirs("src/std/containers", {public = true})
     add_includedirs("src/systems/", {public = true})
+    add_files("src/empty.c") -- for some reason we need this on Mac so it doesnt call 'ar' with no files and error
     add_rules("compile_glsl_vert_shaders")
     add_rules("compile_glsl_frag_shaders")
-    add_files("src/empty.c") -- for some reason we need this on Mac so it doesnt call 'ar' with no files and error
-    add_files("assets/shaders/triangle.vert")
-    add_files("assets/shaders/triangle.frag")
+    add_files("assets/shaders/object.vert")
+    add_files("assets/shaders/object.frag")
     -- add_files("assets/shaders/*.frag")
     set_default(false) -- prevents standalone building of this target
 
-- 
cgit v1.2.3-70-g09d2