Fix formatting nits from review.
This commit is contained in:
parent
bb4ced0280
commit
7b594c125e
@ -2509,12 +2509,12 @@ void CompilerMSL::add_composite_variable_to_interface_block(StorageClass storage
|
|||||||
}
|
}
|
||||||
|
|
||||||
void CompilerMSL::add_composite_member_variable_to_interface_block(StorageClass storage,
|
void CompilerMSL::add_composite_member_variable_to_interface_block(StorageClass storage,
|
||||||
const string &ib_var_ref, SPIRType &ib_type,
|
const string &ib_var_ref, SPIRType &ib_type,
|
||||||
SPIRVariable &var, SPIRType &var_type,
|
SPIRVariable &var, SPIRType &var_type,
|
||||||
uint32_t mbr_idx, InterfaceBlockMeta &meta,
|
uint32_t mbr_idx, InterfaceBlockMeta &meta,
|
||||||
const string &mbr_name_qual,
|
const string &mbr_name_qual,
|
||||||
const string &var_chain_qual,
|
const string &var_chain_qual,
|
||||||
uint32_t& location, uint32_t& var_mbr_idx)
|
uint32_t &location, uint32_t &var_mbr_idx)
|
||||||
{
|
{
|
||||||
auto &entry_func = get<SPIRFunction>(ir.default_entry_point);
|
auto &entry_func = get<SPIRFunction>(ir.default_entry_point);
|
||||||
|
|
||||||
@ -2589,6 +2589,7 @@ void CompilerMSL::add_composite_member_variable_to_interface_block(StorageClass
|
|||||||
var, mbr_type, sub_mbr_idx,
|
var, mbr_type, sub_mbr_idx,
|
||||||
meta, mbr_name, var_chain,
|
meta, mbr_name, var_chain,
|
||||||
location, var_mbr_idx);
|
location, var_mbr_idx);
|
||||||
|
// FIXME: Recursive structs and tessellation breaks here.
|
||||||
var_mbr_idx++;
|
var_mbr_idx++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2705,12 +2706,12 @@ void CompilerMSL::add_composite_member_variable_to_interface_block(StorageClass
|
|||||||
}
|
}
|
||||||
|
|
||||||
void CompilerMSL::add_plain_member_variable_to_interface_block(StorageClass storage,
|
void CompilerMSL::add_plain_member_variable_to_interface_block(StorageClass storage,
|
||||||
const string &ib_var_ref, SPIRType &ib_type,
|
const string &ib_var_ref, SPIRType &ib_type,
|
||||||
SPIRVariable &var, SPIRType &var_type,
|
SPIRVariable &var, SPIRType &var_type,
|
||||||
uint32_t mbr_idx, InterfaceBlockMeta &meta,
|
uint32_t mbr_idx, InterfaceBlockMeta &meta,
|
||||||
const string &mbr_name_qual,
|
const string &mbr_name_qual,
|
||||||
const string &var_chain_qual,
|
const string &var_chain_qual,
|
||||||
uint32_t& location, uint32_t& var_mbr_idx)
|
uint32_t &location, uint32_t &var_mbr_idx)
|
||||||
{
|
{
|
||||||
auto &entry_func = get<SPIRFunction>(ir.default_entry_point);
|
auto &entry_func = get<SPIRFunction>(ir.default_entry_point);
|
||||||
|
|
||||||
@ -3232,15 +3233,19 @@ void CompilerMSL::add_variable_to_interface_block(StorageClass storage, const st
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ((!is_builtin || attribute_load_store) && storage_is_stage_io && is_composite_type)
|
if ((!is_builtin || attribute_load_store) && storage_is_stage_io && is_composite_type)
|
||||||
|
{
|
||||||
add_composite_member_variable_to_interface_block(storage, ib_var_ref, ib_type,
|
add_composite_member_variable_to_interface_block(storage, ib_var_ref, ib_type,
|
||||||
var, var_type, mbr_idx, meta,
|
var, var_type, mbr_idx, meta,
|
||||||
mbr_name_qual, var_chain_qual,
|
mbr_name_qual, var_chain_qual,
|
||||||
location, var_mbr_idx);
|
location, var_mbr_idx);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
add_plain_member_variable_to_interface_block(storage, ib_var_ref, ib_type,
|
add_plain_member_variable_to_interface_block(storage, ib_var_ref, ib_type,
|
||||||
var, var_type, mbr_idx, meta,
|
var, var_type, mbr_idx, meta,
|
||||||
mbr_name_qual, var_chain_qual,
|
mbr_name_qual, var_chain_qual,
|
||||||
location, var_mbr_idx);
|
location, var_mbr_idx);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var_mbr_idx++;
|
var_mbr_idx++;
|
||||||
}
|
}
|
||||||
|
@ -832,19 +832,19 @@ protected:
|
|||||||
SPIRVariable &var, const SPIRType &type,
|
SPIRVariable &var, const SPIRType &type,
|
||||||
InterfaceBlockMeta &meta);
|
InterfaceBlockMeta &meta);
|
||||||
void add_plain_member_variable_to_interface_block(spv::StorageClass storage,
|
void add_plain_member_variable_to_interface_block(spv::StorageClass storage,
|
||||||
const std::string &ib_var_ref, SPIRType &ib_type,
|
const std::string &ib_var_ref, SPIRType &ib_type,
|
||||||
SPIRVariable &var, SPIRType &var_type,
|
SPIRVariable &var, SPIRType &var_type,
|
||||||
uint32_t mbr_idx, InterfaceBlockMeta &meta,
|
uint32_t mbr_idx, InterfaceBlockMeta &meta,
|
||||||
const std::string &mbr_name_qual,
|
const std::string &mbr_name_qual,
|
||||||
const std::string &var_chain_qual,
|
const std::string &var_chain_qual,
|
||||||
uint32_t& location, uint32_t& var_mbr_idx);
|
uint32_t &location, uint32_t &var_mbr_idx);
|
||||||
void add_composite_member_variable_to_interface_block(spv::StorageClass storage,
|
void add_composite_member_variable_to_interface_block(spv::StorageClass storage,
|
||||||
const std::string &ib_var_ref, SPIRType &ib_type,
|
const std::string &ib_var_ref, SPIRType &ib_type,
|
||||||
SPIRVariable &var, SPIRType &var_type,
|
SPIRVariable &var, SPIRType &var_type,
|
||||||
uint32_t mbr_idx, InterfaceBlockMeta &meta,
|
uint32_t mbr_idx, InterfaceBlockMeta &meta,
|
||||||
const std::string &mbr_name_qual,
|
const std::string &mbr_name_qual,
|
||||||
const std::string &var_chain_qual,
|
const std::string &var_chain_qual,
|
||||||
uint32_t& location, uint32_t& var_mbr_idx);
|
uint32_t &location, uint32_t &var_mbr_idx);
|
||||||
void add_tess_level_input_to_interface_block(const std::string &ib_var_ref, SPIRType &ib_type, SPIRVariable &var);
|
void add_tess_level_input_to_interface_block(const std::string &ib_var_ref, SPIRType &ib_type, SPIRVariable &var);
|
||||||
|
|
||||||
void fix_up_interface_member_indices(spv::StorageClass storage, uint32_t ib_type_id);
|
void fix_up_interface_member_indices(spv::StorageClass storage, uint32_t ib_type_id);
|
||||||
|
Loading…
Reference in New Issue
Block a user