update spirv-cross

Try · Feb 10, 2024 · c9c8680 · c9c8680
1 parent 4379099
commit c9c8680
Show file tree

Hide file tree

Showing 5 changed files with 1,267 additions and 600 deletions.
diff --git a/Engine/thirdparty/spirv_cross/spirv_common.hpp b/Engine/thirdparty/spirv_cross/spirv_common.hpp
@@ -578,7 +578,8 @@ struct SPIRType : IVariant
 		// Keep internal types at the end.
 		ControlPointArray,
 		Interpolant,
-		Char
+		Char,
+		Meshlet
 	};
 
 	// Scalar/vector/matrix support.

diff --git a/Engine/thirdparty/spirv_cross/spirv_glsl.cpp b/Engine/thirdparty/spirv_cross/spirv_glsl.cpp
@@ -16196,6 +16196,10 @@ void CompilerGLSL::emit_function(SPIRFunction &func, const Bitset &return_flags)
 	{
 		auto &var = get<SPIRVariable>(v);
 		var.deferred_declaration = false;
+		if (var.storage == StorageClassTaskPayloadWorkgroupEXT)
+		{
+			continue;
+		}
 
 		if (variable_decl_is_remapped_storage(var, StorageClassWorkgroup))
 		{

diff --git a/Engine/thirdparty/spirv_cross/spirv_glsl.hpp b/Engine/thirdparty/spirv_cross/spirv_glsl.hpp
@@ -570,7 +570,7 @@ class CompilerGLSL : public Compiler
 	uint32_t to_array_size_literal(const SPIRType &type, uint32_t index) const;
 	uint32_t to_array_size_literal(const SPIRType &type) const;
 	virtual std::string variable_decl(const SPIRVariable &variable); // Threadgroup arrays can't have a wrapper type
-	std::string variable_decl_function_local(SPIRVariable &variable);
+	virtual std::string variable_decl_function_local(SPIRVariable &variable);
 
 	void add_local_variable_name(uint32_t id);
 	void add_resource_name(uint32_t id);