Remove external glslang

KhronosGroup · Dec 9, 2024 · a4359b1 · a4359b1
1 parent 69046b3
commit a4359b1
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 1,894 deletions.
diff --git a/ExternalDependencies.xcodeproj/project.pbxproj b/ExternalDependencies.xcodeproj/project.pbxproj
diff --git a/ExternalDependencies.xcodeproj/xcshareddata/xcschemes/glslang-iOS.xcscheme b/ExternalDependencies.xcodeproj/xcshareddata/xcschemes/glslang-iOS.xcscheme
diff --git a/ExternalDependencies.xcodeproj/xcshareddata/xcschemes/glslang-macOS.xcscheme b/ExternalDependencies.xcodeproj/xcshareddata/xcschemes/glslang-macOS.xcscheme
diff --git a/ExternalDependencies.xcodeproj/xcshareddata/xcschemes/glslang-tvOS.xcscheme b/ExternalDependencies.xcodeproj/xcshareddata/xcschemes/glslang-tvOS.xcscheme
diff --git a/ExternalDependencies.xcodeproj/xcshareddata/xcschemes/glslang-xrOS.xcscheme b/ExternalDependencies.xcodeproj/xcshareddata/xcschemes/glslang-xrOS.xcscheme
diff --git a/ExternalRevisions/SPIRV-Headers_repo_revision b/ExternalRevisions/SPIRV-Headers_repo_revision
@@ -0,0 +1 @@
+2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801
diff --git a/ExternalRevisions/SPIRV-Tools_repo_revision b/ExternalRevisions/SPIRV-Tools_repo_revision
@@ -0,0 +1 @@
+6dcc7e350a0b9871a825414d42329e44b0eb8109
diff --git a/ExternalRevisions/glslang_repo_revision b/ExternalRevisions/glslang_repo_revision
diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
@@ -682,8 +682,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 					"\"$(SRCROOT)/SPIRV-Cross\"",
-					"\"$(SRCROOT)/glslang\"",
-					"\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
+					"\"$(SRCROOT)/SPIRV-Tools/include\"",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MACH_O_TYPE = staticlib;
@@ -747,8 +746,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 					"\"$(SRCROOT)/SPIRV-Cross\"",
-					"\"$(SRCROOT)/glslang\"",
-					"\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
+					"\"$(SRCROOT)/SPIRV-Tools/include\"",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MACH_O_TYPE = staticlib;

diff --git a/MoltenVKShaderConverter/SPIRV-Tools b/MoltenVKShaderConverter/SPIRV-Tools
@@ -0,0 +1 @@
+../External/SPIRV-Tools
diff --git a/MoltenVKShaderConverter/glslang b/MoltenVKShaderConverter/glslang