AuroraMiddleware/SPIRV-Cross-Vulnerable
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Cross.git synced 2024-11-09 22:00:05 +00:00
Code Issues Projects Releases Wiki Activity

MSL: Fix various bugs with framebuffer fetch on macOS and argument buffers.

Browse Source 
Introduce a helper to make it clearer if a resource can be
considered for argument buffers or not.
This commit is contained in:
Hans-Kristian Arntzen 2021-01-07 15:00:45 +01:00
parent 3136e34215
commit 893a011299
8 changed files with 116 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
reference/shaders-msl-no-opt/frag/subpass-input.decoration-binding.framebuffer-fetch.msl23.argument.frag Normal file
View File

@ -0,0 +1,23 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct spvDescriptorSetBuffer0
{
sampler uSampler [[id(8)]];
texture2d<float> uTex [[id(9)]];
};
struct main0_out
{
float4 FragColor [[color(0)]];
};
fragment main0_out main0(constant spvDescriptorSetBuffer0& spvDescriptorSet0 [[buffer(0)]], float4 uSub [[color(1)]])
{
main0_out out = {};
out.FragColor = uSub + spvDescriptorSet0.uTex.sample(spvDescriptorSet0.uSampler, float2(0.5));
return out;
}

17
reference/shaders-msl-no-opt/frag/subpass-input.decoration-binding.framebuffer-fetch.msl23.frag Normal file
View File

@ -0,0 +1,17 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 FragColor [[color(0)]];
};
fragment main0_out main0(float4 uSub [[color(1)]], texture2d<float> uTex [[texture(9)]], sampler uSampler [[sampler(8)]])
{
main0_out out = {};
out.FragColor = uSub + uTex.sample(uSampler, float2(0.5));
return out;
}

17
reference/shaders-msl-no-opt/frag/subpass-input.decoration-binding.ios.framebuffer-fetch.msl2.frag Normal file
View File

@ -0,0 +1,17 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 FragColor [[color(0)]];
};
fragment main0_out main0(float4 uSub [[color(1)]], texture2d<float> uTex [[texture(9)]], sampler uSampler [[sampler(8)]])
{
main0_out out = {};
out.FragColor = uSub + uTex.sample(uSampler, float2(0.5));
return out;
}

12
shaders-msl-no-opt/frag/subpass-input.decoration-binding.framebuffer-fetch.msl23.argument.frag Normal file
View File

@ -0,0 +1,12 @@
#version 450
layout(set = 0, binding = 10, input_attachment_index = 1) uniform subpassInput uSub;
layout(location = 0) out vec4 FragColor;
layout(set = 0, binding = 9) uniform texture2D uTex;
layout(set = 0, binding = 8) uniform sampler uSampler;
void main()
{
FragColor = subpassLoad(uSub) + texture(sampler2D(uTex, uSampler), vec2(0.5));
}

12
shaders-msl-no-opt/frag/subpass-input.decoration-binding.framebuffer-fetch.msl23.frag Normal file
View File

@ -0,0 +1,12 @@
#version 450
layout(set = 0, binding = 10, input_attachment_index = 1) uniform subpassInput uSub;
layout(location = 0) out vec4 FragColor;
layout(set = 0, binding = 9) uniform texture2D uTex;
layout(set = 0, binding = 8) uniform sampler uSampler;
void main()
{
FragColor = subpassLoad(uSub) + texture(sampler2D(uTex, uSampler), vec2(0.5));
}

12
shaders-msl-no-opt/frag/subpass-input.decoration-binding.ios.framebuffer-fetch.msl2.frag Normal file
View File

@ -0,0 +1,12 @@
#version 450
layout(set = 0, binding = 10, input_attachment_index = 1) uniform subpassInput uSub;
layout(location = 0) out vec4 FragColor;
layout(set = 0, binding = 9) uniform texture2D uTex;
layout(set = 0, binding = 8) uniform sampler uSampler;
void main()
{
FragColor = subpassLoad(uSub) + texture(sampler2D(uTex, uSampler), vec2(0.5));
}

41
spirv_msl.cpp
View File

@ -10906,12 +10906,7 @@ void CompilerMSL::entry_point_args_discrete_descriptors(string &ep_args)
{
auto &type = get_variable_data_type(var);
// Very specifically, image load-store in argument buffers are disallowed on MSL on iOS.
// But we won't know when the argument buffer is encoded whether this image will have
// a NonWritable decoration. So just use discrete arguments for all storage images
// on iOS.
if (!(msl_options.is_ios() && type.basetype == SPIRType::Image && type.image.sampled == 2) &&
var.storage != StorageClassPushConstant)
if (is_supported_argument_buffer_type(type) && var.storage != StorageClassPushConstant)
{
uint32_t desc_set = get_decoration(var_id, DecorationDescriptorSet);
if (descriptor_set_is_argument_buffer(desc_set))
@ -14597,6 +14592,17 @@ bool CompilerMSL::descriptor_set_is_argument_buffer(uint32_t desc_set) const
return (argument_buffer_discrete_mask & (1u << desc_set)) == 0;
}
bool CompilerMSL::is_supported_argument_buffer_type(const SPIRType &type) const
{
// Very specifically, image load-store in argument buffers are disallowed on MSL on iOS.
// But we won't know when the argument buffer is encoded whether this image will have
// a NonWritable decoration. So just use discrete arguments for all storage images
// on iOS.
bool is_storage_image = type.basetype == SPIRType::Image && type.image.sampled == 2;
bool is_supported_type = !msl_options.is_ios() || !is_storage_image;
return !type_is_msl_framebuffer_fetch(type) && is_supported_type;
}
void CompilerMSL::analyze_argument_buffers()
{
// Gather all used resources and sort them out into argument buffers.
@ -14679,23 +14685,20 @@ void CompilerMSL::analyze_argument_buffers()
{
inline_block_vars.push_back(var_id);
}
else if (!constexpr_sampler)
else if (!constexpr_sampler && is_supported_argument_buffer_type(type))
{
// constexpr samplers are not declared as resources.
// Inline uniform blocks are always emitted at the end.
if (!msl_options.is_ios() || type.basetype != SPIRType::Image || type.image.sampled != 2)
{
add_resource_name(var_id);
resources_in_set[desc_set].push_back(
{ &var, to_name(var_id), type.basetype, get_metal_resource_index(var, type.basetype), 0 });
add_resource_name(var_id);
resources_in_set[desc_set].push_back(
{ &var, to_name(var_id), type.basetype, get_metal_resource_index(var, type.basetype), 0 });
// Emulate texture2D atomic operations
if (atomic_image_vars.count(var.self))
{
uint32_t buffer_resource_index = get_metal_resource_index(var, SPIRType::AtomicCounter, 0);
resources_in_set[desc_set].push_back(
{ &var, to_name(var_id) + "_atomic", SPIRType::Struct, buffer_resource_index, 0 });
}
// Emulate texture2D atomic operations
if (atomic_image_vars.count(var.self))
{
uint32_t buffer_resource_index = get_metal_resource_index(var, SPIRType::AtomicCounter, 0);
resources_in_set[desc_set].push_back(
{ &var, to_name(var_id) + "_atomic", SPIRType::Struct, buffer_resource_index, 0 });
}
}

1
spirv_msl.hpp
View File

@ -1026,6 +1026,7 @@ protected:
void activate_argument_buffer_resources();
bool type_is_msl_framebuffer_fetch(const SPIRType &type) const;
bool is_supported_argument_buffer_type(const SPIRType &type) const;
// OpcodeHandler that handles several MSL preprocessing operations.
struct OpCodePreprocessor : OpcodeHandler