From 89d2cb7407a5eff765440162d8d6bb816d1bb23e Mon Sep 17 00:00:00 2001 From: matthew Date: Fri, 15 Aug 2025 07:20:23 +1000 Subject: [PATCH] update submodule, some fixes --- build.sh | 15 ++------------- src/VulkanRenderer | 2 +- src/shared/aliases.d | 4 ++-- src/shared/util.d | 2 +- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/build.sh b/build.sh index bf351a9..149ad4c 100755 --- a/build.sh +++ b/build.sh @@ -25,6 +25,8 @@ for shader in src/shaders/*.glsl; do $shader_compiler $shader_flags $shader_stage $shader "${shader_out}${base_name}.spv" done +/bin/bash src/VulkanRenderer/build.sh build + if [ -x "$(command -v g++)" ]; then cpp_compiler="g++"; c_compiler="gcc"; elif [ -x "$(command -v clang++)" ]; then cpp_compiler="clang++"; c_compiler="clang"; else echo "Unable to find c++ cpp_compiler"; exit -1; fi; @@ -34,19 +36,6 @@ elif [ -x "$(command -v lld)" ]; then linker_cmd="-fuse-ld=lld"; elif [ -x "$(command -v ld)" ]; then linker_cmd="-fuse-ld=ld"; else echo "Unable to find c/c++ linker"; exit -1; fi; -# VMA -src="external/vma/vma.cpp" -flags="-std=c++20 -D_USE_MATH_DEFINES -Iexternal/vma -c -Wno-everything -static" -out="-o" -obj="build/vma.o" -lib="build/libvma.a" - -if ! [ -f build/libvma.a ]; then - $cpp_compiler $flags $src $out $obj - ar rcs $lib $obj - rm $obj -fi - # XXHASH src="external/xxhash/xxhash.c" flags="-std=c99 -Wno-everything -Iexternal/xxhash -c -static" diff --git a/src/VulkanRenderer b/src/VulkanRenderer index b6a93e9..c6a92fa 160000 --- a/src/VulkanRenderer +++ b/src/VulkanRenderer @@ -1 +1 @@ -Subproject commit b6a93e91777f73445e50796324bd0737b0f3921f +Subproject commit c6a92fa58a25fc204198bcd158e170847344d799 diff --git a/src/shared/aliases.d b/src/shared/aliases.d index 0582a69..e183734 100644 --- a/src/shared/aliases.d +++ b/src/shared/aliases.d @@ -26,8 +26,8 @@ alias f64 = double; alias b32 = uint; -alias intptr = intptr_t; -alias uintptr = uintptr_t; +alias intptr = i64; +alias uintptr = u64; alias usize = size_t; diff --git a/src/shared/util.d b/src/shared/util.d index 104029a..374755f 100644 --- a/src/shared/util.d +++ b/src/shared/util.d @@ -7,7 +7,7 @@ import alloc; import core.simd; import std.conv; import std.string; - j + struct DynSlice(T) { T[][] slices;