diff options
| author | Hans-Kristian Arntzen <post@arntzen-software.no> | 2020-11-25 19:00:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 19:00:53 +0300 |
| commit | 3d16060c3243e9f7bfd027de6e2e27c348d1791e (patch) | |
| tree | d1e642af33f6a613cdb9a01f58fb6a9624455544 /spirv_msl.cpp | |
| parent | 1f178be3c9bb1b2e9266afd27a0030157d37b939 (diff) | |
| parent | 1e67b21ee9c08a1227e1ab68ce1755c5aeb0d292 (diff) | |
Merge pull request #1551 from cdavis5e/msl-subgroup-inactive-ballot-mask
MSL: Don't mask off inactive bits in ballot masks.
Diffstat (limited to 'spirv_msl.cpp')
| -rw-r--r-- | spirv_msl.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/spirv_msl.cpp b/spirv_msl.cpp index 9f936be0..a74f62e0 100644 --- a/spirv_msl.cpp +++ b/spirv_msl.cpp @@ -11224,7 +11224,7 @@ void CompilerMSL::fix_up_shader_inputs_outputs() to_expression(builtin_subgroup_invocation_id_id), " - 32, 0), ", msl_options.fixed_subgroup_size, " - max(", to_expression(builtin_subgroup_invocation_id_id), - ", 32u)), uint2(0)) & spvSubgroupBallot(true);"); + ", 32u)), uint2(0));"); } else if (msl_options.fixed_subgroup_size != 0) { @@ -11233,7 +11233,7 @@ void CompilerMSL::fix_up_shader_inputs_outputs() to_expression(builtin_subgroup_invocation_id_id), ", ", msl_options.fixed_subgroup_size, " - ", to_expression(builtin_subgroup_invocation_id_id), - "), uint3(0)) & spvSubgroupBallot(true);"); + "), uint3(0));"); } else if (msl_options.is_ios()) { @@ -11277,8 +11277,7 @@ void CompilerMSL::fix_up_shader_inputs_outputs() to_expression(builtin_subgroup_invocation_id_id), " + 1 - 32, 0), ", msl_options.fixed_subgroup_size, " - max(", to_expression(builtin_subgroup_invocation_id_id), - " + 1, 32u)), uint2(0)) & " - "spvSubgroupBallot(true);"); + " + 1, 32u)), uint2(0));"); } else if (msl_options.fixed_subgroup_size != 0) { @@ -11287,7 +11286,7 @@ void CompilerMSL::fix_up_shader_inputs_outputs() to_expression(builtin_subgroup_invocation_id_id), " + 1, ", msl_options.fixed_subgroup_size, " - ", to_expression(builtin_subgroup_invocation_id_id), - " - 1), uint3(0)) & spvSubgroupBallot(true);"); + " - 1), uint3(0));"); } else if (msl_options.is_ios()) { |