summaryrefslogtreecommitdiff
path: root/xmake.lua
diff options
context:
space:
mode:
authorOmniscient <17525998+omnisci3nce@users.noreply.github.com>2024-03-30 17:42:15 +1100
committerOmniscient <17525998+omnisci3nce@users.noreply.github.com>2024-03-30 17:42:15 +1100
commitf07e87a86e386ba0f65c5a1e962b6a90cfe26ced (patch)
tree4ac8d5e551efd8e269dceefce7c1975889f484c9 /xmake.lua
parentc5176c9c001c7d32cc2c658e09be8a4b5237685b (diff)
uniform with descriptor set. fix image_index being 4 when expoected to be 3
Diffstat (limited to 'xmake.lua')
-rw-r--r--xmake.lua10
1 files changed, 5 insertions, 5 deletions
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