Skip to content

Commit c9c8680

Browse files
committed
update spirv-cross
1 parent 4379099 commit c9c8680

File tree

5 files changed

+1267
-600
lines changed

5 files changed

+1267
-600
lines changed

Diff for: Engine/thirdparty/spirv_cross/spirv_common.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,8 @@ struct SPIRType : IVariant
578578
// Keep internal types at the end.
579579
ControlPointArray,
580580
Interpolant,
581-
Char
581+
Char,
582+
Meshlet
582583
};
583584

584585
// Scalar/vector/matrix support.

Diff for: Engine/thirdparty/spirv_cross/spirv_glsl.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -16196,6 +16196,10 @@ void CompilerGLSL::emit_function(SPIRFunction &func, const Bitset &return_flags)
1619616196
{
1619716197
auto &var = get<SPIRVariable>(v);
1619816198
var.deferred_declaration = false;
16199+
if (var.storage == StorageClassTaskPayloadWorkgroupEXT)
16200+
{
16201+
continue;
16202+
}
1619916203

1620016204
if (variable_decl_is_remapped_storage(var, StorageClassWorkgroup))
1620116205
{

Diff for: Engine/thirdparty/spirv_cross/spirv_glsl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ class CompilerGLSL : public Compiler
570570
uint32_t to_array_size_literal(const SPIRType &type, uint32_t index) const;
571571
uint32_t to_array_size_literal(const SPIRType &type) const;
572572
virtual std::string variable_decl(const SPIRVariable &variable); // Threadgroup arrays can't have a wrapper type
573-
std::string variable_decl_function_local(SPIRVariable &variable);
573+
virtual std::string variable_decl_function_local(SPIRVariable &variable);
574574

575575
void add_local_variable_name(uint32_t id);
576576
void add_resource_name(uint32_t id);

0 commit comments

Comments
 (0)