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

MSL: Fix minor nits.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2022-03-07 11:45:03 +01:00
parent 4ec1fb0aa9
commit 213c5f42ea
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spirv_msl.cpp
View File

@ -3189,7 +3189,7 @@ void CompilerMSL::add_variable_to_interface_block(StorageClass storage, const st
if (storage == StorageClassOutput && is_stage_output_block_member_masked(var, mbr_idx, meta.strip_array)) if (storage == StorageClassOutput && is_stage_output_block_member_masked(var, mbr_idx, meta.strip_array))
{ {
location = UINT32_MAX; // Skip this member and resolve location again on next var member location = UINT32_MAX; // Skip this member and resolve location again on next var member
if (is_block) if (is_block)
masked_block = true; masked_block = true;
@ -3226,7 +3226,7 @@ void CompilerMSL::add_variable_to_interface_block(StorageClass storage, const st
{ {
bool is_composite_type = is_matrix(mbr_type) || is_array(mbr_type) || mbr_type.basetype == SPIRType::Struct; bool is_composite_type = is_matrix(mbr_type) || is_array(mbr_type) || mbr_type.basetype == SPIRType::Struct;
bool attribute_load_store = bool attribute_load_store =
storage == StorageClassInput && get_execution_model() != ExecutionModelFragment; storage == StorageClassInput && get_execution_model() != ExecutionModelFragment;
bool storage_is_stage_io = variable_storage_requires_stage_io(storage); bool storage_is_stage_io = variable_storage_requires_stage_io(storage);
// Clip/CullDistance always need to be declared as user attributes. // Clip/CullDistance always need to be declared as user attributes.
@ -3236,7 +3236,8 @@ void CompilerMSL::add_variable_to_interface_block(StorageClass storage, const st
const string var_name = to_name(var.self); const string var_name = to_name(var.self);
string mbr_name_qual = var_name; string mbr_name_qual = var_name;
string var_chain_qual = var_name; string var_chain_qual = var_name;
if (elem_cnt > 1) { if (elem_cnt > 1)
{
mbr_name_qual += join("_", elem_idx); mbr_name_qual += join("_", elem_idx);
var_chain_qual += join("[", elem_idx, "]"); var_chain_qual += join("[", elem_idx, "]");
} }