Merge pull request #3 from godotengine/moltenvk-1.3.0

Update MoltenVK to 1.3.0 (next Vulkan SDK)
This commit is contained in:
Rémi Verschelde
2025-06-06 00:40:42 +02:00
committed by GitHub
4 changed files with 9 additions and 54 deletions

View File

@@ -1,33 +0,0 @@
diff --git a/glslang/Include/InfoSink.h b/glslang/Include/InfoSink.h
index 23f495dc..137ede85 100644
--- a/glslang/Include/InfoSink.h
+++ b/glslang/Include/InfoSink.h
@@ -36,7 +36,7 @@
#define _INFOSINK_INCLUDED_
#include "../Include/Common.h"
-#include <filesystem>
+//#include <filesystem>
#include <cmath>
namespace glslang {
@@ -101,14 +101,14 @@ public:
snprintf(locText, maxSize, ":%d", loc.line);
if(loc.getFilename() == nullptr && shaderFileName != nullptr && absolute) {
- append(std::filesystem::absolute(shaderFileName).string());
+ //append(std::filesystem::absolute(shaderFileName).string());
} else {
std::string location = loc.getStringNameOrNum(false);
- if (absolute) {
- append(std::filesystem::absolute(location).string());
- } else {
+ //if (absolute) {
+ // append(std::filesystem::absolute(location).string());
+ //} else {
append(location);
- }
+ //}
}
append(locText);

View File

@@ -1,8 +1,8 @@
diff --git a/ExternalDependencies.xcodeproj/project.pbxproj b/ExternalDependencies.xcodeproj/project.pbxproj
index 27442c7b..be4c18d5 100644
index e7e226c9..5288d60f 100644
--- a/ExternalDependencies.xcodeproj/project.pbxproj
+++ b/ExternalDependencies.xcodeproj/project.pbxproj
@@ -7176,7 +7176,7 @@
@@ -4586,7 +4586,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACH_O_TYPE = staticlib;
@@ -11,7 +11,7 @@ index 27442c7b..be4c18d5 100644
SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
@@ -7226,7 +7226,7 @@
@@ -4636,7 +4636,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACH_O_TYPE = staticlib;
@@ -21,10 +21,10 @@ index 27442c7b..be4c18d5 100644
TVOS_DEPLOYMENT_TARGET = 13.0;
VALIDATE_PRODUCT = YES;
diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
index 7a029774..bd6ff644 100644
index 093da584..08351433 100644
--- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
+++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
@@ -2692,7 +2692,7 @@
@@ -2694,7 +2694,7 @@
"\"${BUILT_PRODUCTS_DIR}\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -33,7 +33,7 @@ index 7a029774..bd6ff644 100644
MARKETING_VERSION = "${CURRENT_PROJECT_VERSION}";
MTL_ENABLE_DEBUG_INFO = YES;
PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a";
@@ -2765,7 +2765,7 @@
@@ -2771,7 +2771,7 @@
"\"${BUILT_PRODUCTS_DIR}\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -42,15 +42,3 @@ index 7a029774..bd6ff644 100644
MARKETING_VERSION = "${CURRENT_PROJECT_VERSION}";
MTL_ENABLE_DEBUG_INFO = NO;
PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a";
diff --git a/fetchDependencies b/fetchDependencies
index a870c300..2a349868 100755
--- a/fetchDependencies
+++ b/fetchDependencies
@@ -369,6 +369,7 @@ else
./build_info.py . \
-i build_info.h.tmpl \
-o build/include/glslang/build_info.h
+ patch -p1 < ../../../patches/disable-absolute-paths-for-apple-compat.patch
cd - > /dev/null
fi

View File

@@ -100,10 +100,10 @@ index 5fe34950..e29d7f6b 100644
# Usually requires 'sudo make install'
diff --git a/fetchDependencies b/fetchDependencies
index a870c300..117329d5 100755
index 6d5568a4..52d58589 100755
--- a/fetchDependencies
+++ b/fetchDependencies
@@ -454,6 +454,7 @@ function build_impl() {
@@ -448,6 +448,7 @@ function build_impl() {
-enableThreadSanitizer "${XC_USE_TSAN}" \
-enableUndefinedBehaviorSanitizer "${XC_USE_UBSAN}" \
-derivedDataPath "${XC_LCL_DD_PATH}" \