AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup in constant_expression().

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2023-06-07 12:30:57 +02:00
parent b0b2fd8d90
commit 74bae9a06c
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spirv_glsl.cpp
View File

@ -5707,7 +5707,7 @@ string CompilerGLSL::constant_expression(const SPIRConstant &c, bool inside_bloc
{ {
auto &type = get<SPIRType>(c.constant_type); auto &type = get<SPIRType>(c.constant_type);
if (type.pointer) if (type_is_top_level_pointer(type))
{ {
return backend.null_pointer_literal; return backend.null_pointer_literal;
} }
@ -5722,17 +5722,18 @@ string CompilerGLSL::constant_expression(const SPIRConstant &c, bool inside_bloc
// with Offset = 0, using no ArrayStride on the enclosed array type. // with Offset = 0, using no ArrayStride on the enclosed array type.
// A particular CTS test hits this scenario. // A particular CTS test hits this scenario.
bool array_type_decays = inside_block_like_struct_scope && bool array_type_decays = inside_block_like_struct_scope &&
!type.array.empty() && !backend.array_is_value_type_in_buffer_blocks; type_is_top_level_array(type) &&
!backend.array_is_value_type_in_buffer_blocks;
// Allow Metal to use the array<T> template to make arrays a value type // Allow Metal to use the array<T> template to make arrays a value type
bool needs_trailing_tracket = false; bool needs_trailing_tracket = false;
if (backend.use_initializer_list && backend.use_typed_initializer_list && type.basetype == SPIRType::Struct && if (backend.use_initializer_list && backend.use_typed_initializer_list && type.basetype == SPIRType::Struct &&
type.array.empty()) !type_is_top_level_array(type))
{ {
res = type_to_glsl_constructor(type) + "{ "; res = type_to_glsl_constructor(type) + "{ ";
} }
else if (backend.use_initializer_list && backend.use_typed_initializer_list && backend.array_is_value_type && else if (backend.use_initializer_list && backend.use_typed_initializer_list && backend.array_is_value_type &&
!type.array.empty() && !array_type_decays) type_is_top_level_array(type) && !array_type_decays)
{ {
res = type_to_glsl_constructor(type) + "({ "; res = type_to_glsl_constructor(type) + "({ ";
needs_trailing_tracket = true; needs_trailing_tracket = true;
@ -5764,7 +5765,7 @@ string CompilerGLSL::constant_expression(const SPIRConstant &c, bool inside_bloc
res += to_name(elem); res += to_name(elem);
else else
{ {
if (type.array.empty() && type.basetype == SPIRType::Struct) if (!type_is_top_level_array(type) && type.basetype == SPIRType::Struct)
{ {
// When we get down to emitting struct members, override the block-like information. // When we get down to emitting struct members, override the block-like information.
// For constants, we can freely mix and match block-like state. // For constants, we can freely mix and match block-like state.
@ -5794,11 +5795,11 @@ string CompilerGLSL::constant_expression(const SPIRConstant &c, bool inside_bloc
if (backend.supports_empty_struct) if (backend.supports_empty_struct)
return "{ }"; return "{ }";
else if (backend.use_typed_initializer_list) else if (backend.use_typed_initializer_list)
return join(type_to_glsl(get<SPIRType>(c.constant_type)), "{ 0 }"); return join(type_to_glsl(type), "{ 0 }");
else if (backend.use_initializer_list) else if (backend.use_initializer_list)
return "{ 0 }"; return "{ 0 }";
else else
return join(type_to_glsl(get<SPIRType>(c.constant_type)), "(0)"); return join(type_to_glsl(type), "(0)");
} }
else if (c.columns() == 1) else if (c.columns() == 1)
{ {
@ -5806,7 +5807,7 @@ string CompilerGLSL::constant_expression(const SPIRConstant &c, bool inside_bloc
} }
else else
{ {
string res = type_to_glsl(get<SPIRType>(c.constant_type)) + "("; string res = type_to_glsl(type) + "(";
for (uint32_t col = 0; col < c.columns(); col++) for (uint32_t col = 0; col < c.columns(); col++)
{ {
if (c.specialization_constant_id(col) != 0) if (c.specialization_constant_id(col) != 0)

4
spirv_msl.cpp
View File

@ -7235,7 +7235,7 @@ void CompilerMSL::declare_constant_arrays()
// FIXME: However, hoisting constants to main() means we need to pass down constant arrays to leaf functions if they are used there. // FIXME: However, hoisting constants to main() means we need to pass down constant arrays to leaf functions if they are used there.
// If there are multiple functions in the module, drop this case to avoid breaking use cases which do not need to // If there are multiple functions in the module, drop this case to avoid breaking use cases which do not need to
// link into Metal libraries. This is hacky. // link into Metal libraries. This is hacky.
if (!type.array.empty() && (!fully_inlined || is_scalar(type) || is_vector(type))) if (type_is_top_level_array(type) && (!fully_inlined || is_scalar(type) || is_vector(type)))
{ {
add_resource_name(c.self); add_resource_name(c.self);
auto name = to_name(c.self); auto name = to_name(c.self);
@ -7267,7 +7267,7 @@ void CompilerMSL::declare_complex_constant_arrays()
return; return;
auto &type = this->get<SPIRType>(c.constant_type); auto &type = this->get<SPIRType>(c.constant_type);
if (!type.array.empty() && !(is_scalar(type) || is_vector(type))) if (type_is_top_level_array(type) && !(is_scalar(type) || is_vector(type)))
{ {
add_resource_name(c.self); add_resource_name(c.self);
auto name = to_name(c.self); auto name = to_name(c.self);