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

MSL: Handle masked outputs in extract_global_variables.

Browse Source 
Need to conditionally add gl_in or gl_out.
This commit is contained in:
Hans-Kristian Arntzen 2021-04-06 12:57:00 +02:00
parent 50a6bc058a
commit e7824c8b6e
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
spirv_msl.cpp
View File

@ -1740,12 +1740,34 @@ void CompilerMSL::extract_global_variables_from_function(uint32_t func_id, std::
auto *p_type = &get<SPIRType>(type_id); auto *p_type = &get<SPIRType>(type_id);
BuiltIn bi_type = BuiltIn(get_decoration(arg_id, DecorationBuiltIn)); BuiltIn bi_type = BuiltIn(get_decoration(arg_id, DecorationBuiltIn));
if (((is_tessellation_shader() && var.storage == StorageClassInput) || bool is_patch = has_decoration(arg_id, DecorationPatch) || is_patch_block(*p_type);
(get_execution_model() == ExecutionModelTessellationControl && var.storage == StorageClassOutput)) && bool is_control_point_storage =
!(has_decoration(arg_id, DecorationPatch) || is_patch_block(*p_type)) && !is_patch &&
(!is_builtin_variable(var) || bi_type == BuiltInPosition || bi_type == BuiltInPointSize || ((is_tessellation_shader() && var.storage == StorageClassInput) ||
bi_type == BuiltInClipDistance || bi_type == BuiltInCullDistance || (get_execution_model() == ExecutionModelTessellationControl && var.storage == StorageClassOutput));
p_type->basetype == SPIRType::Struct)) bool is_builtin = is_builtin_variable(var);
bool variable_is_stage_io =
!is_builtin || bi_type == BuiltInPosition || bi_type == BuiltInPointSize ||
bi_type == BuiltInClipDistance || bi_type == BuiltInCullDistance ||
p_type->basetype == SPIRType::Struct;
bool is_redirected_to_global_stage_io = is_control_point_storage && variable_is_stage_io;
// If output is masked it is not considered part of the global stage IO interface.
if (is_redirected_to_global_stage_io && var.storage == StorageClassOutput)
{
if (is_builtin)
{
is_redirected_to_global_stage_io = !is_stage_output_builtin_masked(bi_type);
}
else if (has_decoration(var.self, DecorationLocation))
{
is_redirected_to_global_stage_io = !is_stage_output_location_masked(
get_decoration(var.self, DecorationLocation),
get_decoration(var.self, DecorationComponent));
}
}
if (is_redirected_to_global_stage_io)
{ {
// Tessellation control shaders see inputs and per-vertex outputs as arrays. // Tessellation control shaders see inputs and per-vertex outputs as arrays.
// Similarly, tessellation evaluation shaders see per-vertex inputs as arrays. // Similarly, tessellation evaluation shaders see per-vertex inputs as arrays.
@ -1785,7 +1807,7 @@ void CompilerMSL::extract_global_variables_from_function(uint32_t func_id, std::
for (auto &mbr_type_id : p_type->member_types) for (auto &mbr_type_id : p_type->member_types)
{ {
BuiltIn builtin = BuiltInMax; BuiltIn builtin = BuiltInMax;
bool is_builtin = is_member_builtin(*p_type, mbr_idx, &builtin); is_builtin = is_member_builtin(*p_type, mbr_idx, &builtin);
if (is_builtin && has_active_builtin(builtin, var.storage)) if (is_builtin && has_active_builtin(builtin, var.storage))
{ {
// Add a arg variable with the same type and decorations as the member // Add a arg variable with the same type and decorations as the member