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

Merge pull request #1709 from billhollings/fix-sample-mask-in

Browse Source 
MSL: Adjust gl_SampleMaskIn for sample-shading and/or fixed sample mask.
This commit is contained in:
Hans-Kristian Arntzen 2021-07-15 16:32:35 +02:00 committed by GitHub
commit 2fcbef398c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 100 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
reference/opt/shaders-msl/frag/sample-mask-in-and-out.fixed-sample-mask.force-sample.frag Normal file
View File

@ -0,0 +1,20 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 FragColor [[color(0)]];
uint gl_SampleMask [[sample_mask]];
};
fragment main0_out main0(uint gl_SampleMaskIn [[sample_mask]], uint gl_SampleID [[sample_id]])
{
main0_out out = {};
out.FragColor = float4(1.0);
out.gl_SampleMask = (gl_SampleMaskIn & 0x22 & (1 << gl_SampleID));
out.gl_SampleMask &= 0x22;
return out;
}

4
reference/opt/shaders-msl/frag/sample-mask-in-and-out.fixed-sample-mask.frag
View File

@ -13,8 +13,8 @@ fragment main0_out main0(uint gl_SampleMaskIn [[sample_mask]])
{
main0_out out = {};
out.FragColor = float4(1.0);
out.gl_SampleMask = gl_SampleMaskIn;
out.gl_SampleMask &= 34;
out.gl_SampleMask = (gl_SampleMaskIn & 0x22);
out.gl_SampleMask &= 0x22;
return out;
}

2
reference/opt/shaders-msl/frag/sample-mask-not-used.fixed-sample-mask.frag
View File

@ -13,7 +13,7 @@ fragment main0_out main0()
{
main0_out out = {};
out.FragColor = float4(1.0);
out.gl_SampleMask = 34;
out.gl_SampleMask = 0x22;
return out;
}

2
reference/opt/shaders-msl/frag/sample-mask.fixed-sample-mask.frag
View File

@ -14,7 +14,7 @@ fragment main0_out main0()
main0_out out = {};
out.FragColor = float4(1.0);
out.gl_SampleMask = 0;
out.gl_SampleMask &= 34;
out.gl_SampleMask &= 0x22;
return out;
}

20
reference/shaders-msl/frag/sample-mask-in-and-out.fixed-sample-mask.force-sample.frag Normal file
View File

@ -0,0 +1,20 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 FragColor [[color(0)]];
uint gl_SampleMask [[sample_mask]];
};
fragment main0_out main0(uint gl_SampleMaskIn [[sample_mask]], uint gl_SampleID [[sample_id]])
{
main0_out out = {};
out.FragColor = float4(1.0);
out.gl_SampleMask = (gl_SampleMaskIn & 0x22 & (1 << gl_SampleID));
out.gl_SampleMask &= 0x22;
return out;
}

4
reference/shaders-msl/frag/sample-mask-in-and-out.fixed-sample-mask.frag
View File

@ -13,8 +13,8 @@ fragment main0_out main0(uint gl_SampleMaskIn [[sample_mask]])
{
main0_out out = {};
out.FragColor = float4(1.0);
out.gl_SampleMask = gl_SampleMaskIn;
out.gl_SampleMask &= 34;
out.gl_SampleMask = (gl_SampleMaskIn & 0x22);
out.gl_SampleMask &= 0x22;
return out;
}

2
reference/shaders-msl/frag/sample-mask-not-used.fixed-sample-mask.frag
View File

@ -13,7 +13,7 @@ fragment main0_out main0()
{
main0_out out = {};
out.FragColor = float4(1.0);
out.gl_SampleMask = 34;
out.gl_SampleMask = 0x22;
return out;
}

2
reference/shaders-msl/frag/sample-mask.fixed-sample-mask.frag
View File

@ -14,7 +14,7 @@ fragment main0_out main0()
main0_out out = {};
out.FragColor = float4(1.0);
out.gl_SampleMask = 0;
out.gl_SampleMask &= 34;
out.gl_SampleMask &= 0x22;
return out;
}

10
shaders-msl/frag/sample-mask-in-and-out.fixed-sample-mask.force-sample.frag Normal file
View File

@ -0,0 +1,10 @@
#version 450
layout(location = 0) out vec4 FragColor;
void main()
{
FragColor = vec4(1.0);
gl_SampleMask[0] = gl_SampleMaskIn[0];
}

65
spirv_msl.cpp
View File

@ -230,13 +230,12 @@ void CompilerMSL::build_implicit_builtins()
(active_input_builtins.get(BuiltInVertexId) || active_input_builtins.get(BuiltInVertexIndex) ||
active_input_builtins.get(BuiltInBaseVertex) || active_input_builtins.get(BuiltInInstanceId) ||
active_input_builtins.get(BuiltInInstanceIndex) || active_input_builtins.get(BuiltInBaseInstance));
bool need_sample_mask = msl_options.additional_fixed_sample_mask != 0xffffffff;
bool need_local_invocation_index = msl_options.emulate_subgroups && active_input_builtins.get(BuiltInSubgroupId);
bool need_workgroup_size = msl_options.emulate_subgroups && active_input_builtins.get(BuiltInNumSubgroups);
if (need_subpass_input || need_sample_pos || need_subgroup_mask || need_vertex_params || need_tesc_params ||
need_multiview || need_dispatch_base || need_vertex_base_params || need_grid_params || needs_sample_id ||
needs_subgroup_invocation_id || needs_subgroup_size || need_sample_mask || need_local_invocation_index ||
needs_subgroup_invocation_id || needs_subgroup_size || has_additional_fixed_sample_mask() || need_local_invocation_index ||
need_workgroup_size)
{
bool has_frag_coord = false;
@ -267,7 +266,7 @@ void CompilerMSL::build_implicit_builtins()
if (var.storage == StorageClassOutput)
{
if (need_sample_mask && builtin == BuiltInSampleMask)
if (has_additional_fixed_sample_mask() && builtin == BuiltInSampleMask)
{
builtin_sample_mask_id = var.self;
mark_implicit_builtin(StorageClassOutput, BuiltInSampleMask, var.self);
@ -757,7 +756,7 @@ void CompilerMSL::build_implicit_builtins()
builtin_dispatch_base_id = var_id;
}
if (need_sample_mask && !does_shader_write_sample_mask)
if (has_additional_fixed_sample_mask() && !does_shader_write_sample_mask)
{
uint32_t offset = ir.increase_bound_by(2);
uint32_t var_id = offset + 1;
@ -12311,29 +12310,17 @@ void CompilerMSL::fix_up_shader_inputs_outputs()
break;
}
}
else if (var.storage == StorageClassOutput && is_builtin_variable(var) && active_output_builtins.get(bi_type))
else if (var.storage == StorageClassOutput && get_execution_model() == ExecutionModelFragment &&
is_builtin_variable(var) && active_output_builtins.get(bi_type) &&
bi_type == BuiltInSampleMask && has_additional_fixed_sample_mask())
{
if (bi_type == BuiltInSampleMask && get_execution_model() == ExecutionModelFragment &&
msl_options.additional_fixed_sample_mask != 0xffffffff)
{
// If the additional fixed sample mask was set, we need to adjust the sample_mask
// output to reflect that. If the shader outputs the sample_mask itself too, we need
// to AND the two masks to get the final one.
if (does_shader_write_sample_mask)
{
entry_func.fixup_hooks_out.push_back([=]() {
statement(to_expression(builtin_sample_mask_id),
" &= ", msl_options.additional_fixed_sample_mask, ";");
});
}
else
{
entry_func.fixup_hooks_out.push_back([=]() {
statement(to_expression(builtin_sample_mask_id), " = ",
msl_options.additional_fixed_sample_mask, ";");
});
}
}
// If the additional fixed sample mask was set, we need to adjust the sample_mask
// output to reflect that. If the shader outputs the sample_mask itself too, we need
// to AND the two masks to get the final one.
string op_str = does_shader_write_sample_mask ? " &= " : " = ";
entry_func.fixup_hooks_out.push_back([=]() {
statement(to_expression(builtin_sample_mask_id), op_str, additional_fixed_sample_mask_str(), ";");
});
}
});
}
@ -14050,9 +14037,28 @@ string CompilerMSL::builtin_to_glsl(BuiltIn builtin, StorageClass storage)
case BuiltInClipDistance:
case BuiltInCullDistance:
case BuiltInLayer:
if (get_execution_model() == ExecutionModelTessellationControl)
break;
if (storage != StorageClassInput && current_function && (current_function->self == ir.default_entry_point) &&
!is_stage_output_builtin_masked(builtin))
return stage_out_var_name + "." + CompilerGLSL::builtin_to_glsl(builtin, storage);
break;
case BuiltInSampleMask:
if (get_execution_model() == ExecutionModelTessellationControl)
break;
if (storage == StorageClassInput && current_function && (current_function->self == ir.default_entry_point) &&
(has_additional_fixed_sample_mask() || needs_sample_id))
{
string samp_mask_in;
samp_mask_in += "(" + CompilerGLSL::builtin_to_glsl(builtin, storage);
if (has_additional_fixed_sample_mask())
samp_mask_in += " & " + additional_fixed_sample_mask_str();
if (needs_sample_id)
samp_mask_in += " & (1 << gl_SampleID)";
samp_mask_in += ")";
return samp_mask_in;
}
if (storage != StorageClassInput && current_function && (current_function->self == ir.default_entry_point) &&
!is_stage_output_builtin_masked(builtin))
return stage_out_var_name + "." + CompilerGLSL::builtin_to_glsl(builtin, storage);
@ -15936,3 +15942,10 @@ const char *CompilerMSL::get_combined_sampler_suffix() const
void CompilerMSL::emit_block_hints(const SPIRBlock &)
{
}
string CompilerMSL::additional_fixed_sample_mask_str() const
{
char print_buffer[32];
sprintf(print_buffer, "0x%x", msl_options.additional_fixed_sample_mask);
return print_buffer;
}

3
spirv_msl.hpp
View File

@ -1093,6 +1093,9 @@ protected:
bool variable_storage_requires_stage_io(spv::StorageClass storage) const;
bool has_additional_fixed_sample_mask() const { return msl_options.additional_fixed_sample_mask != 0xffffffff; }
std::string additional_fixed_sample_mask_str() const;
// OpcodeHandler that handles several MSL preprocessing operations.
struct OpCodePreprocessor : OpcodeHandler
{