initial commit, 4.5 stable
Some checks failed
🔗 GHA / 📊 Static checks (push) Has been cancelled
🔗 GHA / 🤖 Android (push) Has been cancelled
🔗 GHA / 🍏 iOS (push) Has been cancelled
🔗 GHA / 🐧 Linux (push) Has been cancelled
🔗 GHA / 🍎 macOS (push) Has been cancelled
🔗 GHA / 🏁 Windows (push) Has been cancelled
🔗 GHA / 🌐 Web (push) Has been cancelled
Some checks failed
🔗 GHA / 📊 Static checks (push) Has been cancelled
🔗 GHA / 🤖 Android (push) Has been cancelled
🔗 GHA / 🍏 iOS (push) Has been cancelled
🔗 GHA / 🐧 Linux (push) Has been cancelled
🔗 GHA / 🍎 macOS (push) Has been cancelled
🔗 GHA / 🏁 Windows (push) Has been cancelled
🔗 GHA / 🌐 Web (push) Has been cancelled
This commit is contained in:
33
thirdparty/glslang/patches/0001-apple-disable-absolute-paths.patch
vendored
Normal file
33
thirdparty/glslang/patches/0001-apple-disable-absolute-paths.patch
vendored
Normal file
@@ -0,0 +1,33 @@
|
||||
diff --git a/thirdparty/glslang/glslang/Include/InfoSink.h b/thirdparty/glslang/glslang/Include/InfoSink.h
|
||||
index 23f495dcb7..137ede8510 100644
|
||||
--- a/thirdparty/glslang/glslang/Include/InfoSink.h
|
||||
+++ b/thirdparty/glslang/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);
|
12
thirdparty/glslang/patches/0002-gcc15-include-fix.patch
vendored
Normal file
12
thirdparty/glslang/patches/0002-gcc15-include-fix.patch
vendored
Normal file
@@ -0,0 +1,12 @@
|
||||
diff --git a/thirdparty/glslang/SPIRV/SpvBuilder.h b/thirdparty/glslang/SPIRV/SpvBuilder.h
|
||||
index a65a98e337..1499592c4f 100644
|
||||
--- a/thirdparty/glslang/SPIRV/SpvBuilder.h
|
||||
+++ b/thirdparty/glslang/SPIRV/SpvBuilder.h
|
||||
@@ -56,6 +56,7 @@ namespace spv {
|
||||
}
|
||||
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <set>
|
Reference in New Issue
Block a user