Updated glslang and SPIRV-Cross to the latest revisions.

akb825 · akb825 · commit efc3d290f0df · 2022-11-06T19:25:15.000-08:00
diff --git a/Compile/CMakeLists.txt b/Compile/CMakeLists.txt
@@ -30,7 +30,7 @@ file(GLOB_RECURSE glslangSources
 	${GLSLANG_DIR}/OGLCompilersDLL/*.cpp ${GLSLANG_DIR}/OGLCompilersDLL/*.h
 	${GLSLANG_DIR}/SPIRV/*.cpp ${GLSLANG_DIR}/SPIRV/*.h)
 set(glslResourceSources
-	${GLSLANG_DIR}/StandAlone/ResourceLimits.cpp ${GLSLANG_DIR}/StandAlone/ResourceLimits.h)
+	${GLSLANG_DIR}/StandAlone/ResourceLimits.cpp ${GLSLANG_DIR}/glslang/Public/ResourceLimits.h)
 file(GLOB spirvCrossSources ${SPIRV_CROSS_DIR}/spirv_*.cpp ${SPIRV_CROSS_DIR}/spirv_*.hpp)
 
 # SPIRV-Tools has too complex of a build configuration to just embed the source in this library,
diff --git a/Compile/SPIRV-Cross b/Compile/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit f09ba2777714871bddb70d049878af34b94fa54d
+Subproject commit abc31207bffbc1bef4192746af44b3be1abcff17
diff --git a/Compile/glslang b/Compile/glslang
@@ -1 +1 @@
-Subproject commit 1e4bae626bc9564193d7d3dfee8da698a943eb83
+Subproject commit 22d69d391e73b5c099bb8b0feddc95595b59063a
diff --git a/Compile/src/Compiler.cpp b/Compile/src/Compiler.cpp
@@ -36,7 +36,7 @@
 #include "SPIRV/GlslangToSpv.h"
 #include "SPIRV/SPVRemapper.h"
 #include "OGLCompilersDLL/InitializeDll.h"
-#include "StandAlone/ResourceLimits.h"
+#include "glslang/Public/ResourceLimits.h"
 
 #if MSL_GCC || MSL_CLANG
 #pragma GCC diagnostic pop
@@ -277,7 +277,7 @@ void Compiler::shutdown()
 
 const TBuiltInResource& Compiler::getDefaultResources()
 {
-	return glslang::DefaultTBuiltInResource;
+	return *GetDefaultResources();;
 }
 
 bool Compiler::compile(Stages& stages, Output &output, const std::string& baseFileName,
diff --git a/Compile/src/Target.cpp b/Compile/src/Target.cpp
@@ -24,7 +24,7 @@
 #include "Preprocessor.h"
 #include "SpirVProcessor.h"
 
-#include "StandAlone/ResourceLimits.h"
+#include "glslang/Public/ResourceLimits.h"
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -721,7 +721,7 @@ bool Target::compileImpl(CompiledResult& result, Output& output, Parser& parser,
 	}
 
 	// Read in the resource limits.
-	TBuiltInResource resources = glslang::DefaultTBuiltInResource;
+	TBuiltInResource resources = *GetDefaultResources();
 	if (!m_resourcesFile.empty())
 	{
 		std::ifstream stream(m_resourcesFile);

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`#include "SPIRV/GlslangToSpv.h"`
`37`	`37`	`#include "SPIRV/SPVRemapper.h"`
`38`	`38`	`#include "OGLCompilersDLL/InitializeDll.h"`
`39`		`-#include "StandAlone/ResourceLimits.h"`
	`39`	`+#include "glslang/Public/ResourceLimits.h"`
`40`	`40`
`41`	`41`	`#if MSL_GCC \|\| MSL_CLANG`
`42`	`42`	`#pragma GCC diagnostic pop`
`@@ -277,7 +277,7 @@ void Compiler::shutdown()`
`277`	`277`
`278`	`278`	`const TBuiltInResource& Compiler::getDefaultResources()`
`279`	`279`	`{`
`280`		`- return glslang::DefaultTBuiltInResource;`
	`280`	`+ return *GetDefaultResources();;`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`bool Compiler::compile(Stages& stages, Output &output, const std::string& baseFileName,`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include "Preprocessor.h"`
`25`	`25`	`#include "SpirVProcessor.h"`
`26`	`26`
`27`		`-#include "StandAlone/ResourceLimits.h"`
	`27`	`+#include "glslang/Public/ResourceLimits.h"`
`28`	`28`
`29`	`29`	`#include <boost/algorithm/string/classification.hpp>`
`30`	`30`	`#include <boost/algorithm/string/split.hpp>`
`@@ -721,7 +721,7 @@ bool Target::compileImpl(CompiledResult& result, Output& output, Parser& parser,`
`721`	`721`	`}`
`722`	`722`
`723`	`723`	`// Read in the resource limits.`
`724`		`- TBuiltInResource resources = glslang::DefaultTBuiltInResource;`
	`724`	`+ TBuiltInResource resources = *GetDefaultResources();`
`725`	`725`	`if (!m_resourcesFile.empty())`
`726`	`726`	`{`
`727`	`727`	`std::ifstream stream(m_resourcesFile);`