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

MSL: Fix depth2d 4-component fixup.

Browse Source 
Need to look at the backing image for the image. We might have found
diverging use at the image variable level, not just expression level.
This commit is contained in:
Hans-Kristian Arntzen 2019-04-03 10:24:22 +02:00
parent fc37c52d26
commit 7e37623e82
3 changed files with 126 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
reference/shaders-msl-no-opt/asm/frag/image-type-normal-comparison-usage.asm.frag Normal file
View File

@ -0,0 +1,31 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 out_var_SV_Target0 [[color(0)]];
};
struct main0_in
{
float2 in_var_TEXCOORD0 [[user(locn0)]];
};
fragment main0_out main0(main0_in in [[stage_in]], depth2d<float> ShadowMap [[texture(0)]], sampler SampleNormal [[sampler(0)]], sampler SampleShadow [[sampler(1)]])
{
main0_out out = {};
float _41;
if (in.in_var_TEXCOORD0.x > 0.5)
{
_41 = float(float4(ShadowMap.sample(SampleNormal, in.in_var_TEXCOORD0)).x <= 0.5);
}
else
{
_41 = ShadowMap.sample_compare(SampleShadow, in.in_var_TEXCOORD0, 0.5, level(0.0));
}
out.out_var_SV_Target0 = float4(_41, _41, _41, 1.0);
return out;
}

76
shaders-msl-no-opt/asm/frag/image-type-normal-comparison-usage.asm.frag Normal file
View File

@ -0,0 +1,76 @@
; SPIR-V
; Version: 1.0
; Generator: Google spiregg; 0
; Bound: 43
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %in_var_TEXCOORD0 %out_var_SV_Target0
OpExecutionMode %main OriginUpperLeft
OpSource HLSL 600
OpName %type_2d_image "type.2d.image"
OpName %ShadowMap "ShadowMap"
OpName %type_sampler "type.sampler"
OpName %SampleNormal "SampleNormal"
OpName %SampleShadow "SampleShadow"
OpName %in_var_TEXCOORD0 "in.var.TEXCOORD0"
OpName %out_var_SV_Target0 "out.var.SV_Target0"
OpName %main "main"
OpName %type_sampled_image "type.sampled.image"
OpDecorate %in_var_TEXCOORD0 Location 0
OpDecorate %out_var_SV_Target0 Location 0
OpDecorate %ShadowMap DescriptorSet 0
OpDecorate %ShadowMap Binding 0
OpDecorate %SampleNormal DescriptorSet 0
OpDecorate %SampleNormal Binding 0
OpDecorate %SampleShadow DescriptorSet 0
OpDecorate %SampleShadow Binding 1
%float = OpTypeFloat 32
%float_0_5 = OpConstant %float 0.5
%float_1 = OpConstant %float 1
%float_0 = OpConstant %float 0
%v4float = OpTypeVector %float 4
%type_2d_image = OpTypeImage %float 2D 2 0 0 1 Unknown
%_ptr_UniformConstant_type_2d_image = OpTypePointer UniformConstant %type_2d_image
%type_sampler = OpTypeSampler
%_ptr_UniformConstant_type_sampler = OpTypePointer UniformConstant %type_sampler
%v2float = OpTypeVector %float 2
%_ptr_Input_v2float = OpTypePointer Input %v2float
%_ptr_Output_v4float = OpTypePointer Output %v4float
%void = OpTypeVoid
%21 = OpTypeFunction %void
%bool = OpTypeBool
%type_sampled_image = OpTypeSampledImage %type_2d_image
%ShadowMap = OpVariable %_ptr_UniformConstant_type_2d_image UniformConstant
%SampleNormal = OpVariable %_ptr_UniformConstant_type_sampler UniformConstant
%SampleShadow = OpVariable %_ptr_UniformConstant_type_sampler UniformConstant
%in_var_TEXCOORD0 = OpVariable %_ptr_Input_v2float Input
%out_var_SV_Target0 = OpVariable %_ptr_Output_v4float Output
%main = OpFunction %void None %21
%23 = OpLabel
%24 = OpLoad %v2float %in_var_TEXCOORD0
%25 = OpCompositeExtract %float %24 0
%26 = OpFOrdGreaterThan %bool %25 %float_0_5
OpSelectionMerge %27 None
OpBranchConditional %26 %28 %29
%28 = OpLabel
%30 = OpLoad %type_2d_image %ShadowMap
%31 = OpLoad %type_sampler %SampleNormal
%32 = OpSampledImage %type_sampled_image %30 %31
%33 = OpImageSampleImplicitLod %v4float %32 %24 None
%34 = OpCompositeExtract %float %33 0
%35 = OpFOrdLessThanEqual %bool %34 %float_0_5
%36 = OpSelect %float %35 %float_1 %float_0
OpBranch %27
%29 = OpLabel
%37 = OpLoad %type_2d_image %ShadowMap
%38 = OpLoad %type_sampler %SampleShadow
%39 = OpSampledImage %type_sampled_image %37 %38
%40 = OpImageSampleDrefExplicitLod %float %39 %24 %float_0_5 Lod %float_0
OpBranch %27
%27 = OpLabel
%41 = OpPhi %float %36 %28 %40 %29
%42 = OpCompositeConstruct %v4float %41 %41 %41 %float_1
OpStore %out_var_SV_Target0 %42
OpReturn
OpFunctionEnd

28
spirv_glsl.cpp
View File

@ -4426,16 +4426,26 @@ void CompilerGLSL::emit_texture_op(const Instruction &i)
// Sampling from a texture which was deduced to be a depth image, might actually return 1 component here.
// Remap back to 4 components as sampling opcodes expect.
bool image_is_depth;
const auto *combined = maybe_get<SPIRCombinedImageSampler>(img);
if (combined)
image_is_depth = image_is_comparison(imgtype, combined->image);
else
image_is_depth = image_is_comparison(imgtype, img);
if (image_is_depth && backend.comparison_image_samples_scalar && image_opcode_is_sample_no_dref(op))
if (backend.comparison_image_samples_scalar && image_opcode_is_sample_no_dref(op))
{
expr = remap_swizzle(get<SPIRType>(result_type), 1, expr);
bool image_is_depth = false;
const auto *combined = maybe_get<SPIRCombinedImageSampler>(img);
uint32_t image_id = combined ? combined->image : img;
if (combined && image_is_comparison(imgtype, combined->image))
image_is_depth = true;
else if (image_is_comparison(imgtype, img))
image_is_depth = true;
// We must also check the backing variable for the image.
// We might have loaded an OpImage, and used that handle for two different purposes.
// Once with comparison, once without.
auto *image_variable = maybe_get_backing_variable(image_id);
if (image_variable && image_is_comparison(get<SPIRType>(image_variable->basetype), image_variable->self))
image_is_depth = true;
if (image_is_depth)
expr = remap_swizzle(get<SPIRType>(result_type), 1, expr);
}
// Deals with reads from MSL. We might need to downconvert to fewer components.