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

Merge pull request #1504 from KhronosGroup/fix-1502

Browse Source 
MSL: Do not use component::x gather for depth2d textures.
This commit is contained in:
Hans-Kristian Arntzen 2020-10-26 17:40:46 +01:00 committed by GitHub
commit b3a74f3a22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 98 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
reference/shaders-msl-no-opt/frag/depth-image-gather.asm.frag Normal file
View File

@ -0,0 +1,22 @@
#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> g_depthTexture [[texture(0)]], sampler g_sampler [[sampler(0)]], sampler g_comp [[sampler(1)]])
{
main0_out out = {};
out.out_var_SV_Target0 = g_depthTexture.gather_compare(g_comp, in.in_var_TEXCOORD0, 0.5) * g_depthTexture.gather(g_sampler, in.in_var_TEXCOORD0, int2(0));
return out;
}

72
shaders-msl-no-opt/frag/depth-image-gather.asm.frag Normal file
View File

@ -0,0 +1,72 @@
; SPIR-V
; Version: 1.3
; Generator: Google spiregg; 0
; Bound: 36
; Schema: 0
OpCapability Shader
OpExtension "SPV_GOOGLE_hlsl_functionality1"
OpExtension "SPV_GOOGLE_user_type"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %psMain "main" %gl_FragCoord %in_var_TEXCOORD0 %out_var_SV_Target0
OpExecutionMode %psMain OriginUpperLeft
OpSource HLSL 500
OpName %type_2d_image "type.2d.image"
OpName %g_depthTexture "g_depthTexture"
OpName %type_sampler "type.sampler"
OpName %g_sampler "g_sampler"
OpName %g_comp "g_comp"
OpName %in_var_TEXCOORD0 "in.var.TEXCOORD0"
OpName %out_var_SV_Target0 "out.var.SV_Target0"
OpName %psMain "psMain"
OpName %type_sampled_image "type.sampled.image"
OpDecorate %gl_FragCoord BuiltIn FragCoord
OpDecorateString %gl_FragCoord UserSemantic "SV_Position"
OpDecorateString %in_var_TEXCOORD0 UserSemantic "TEXCOORD0"
OpDecorateString %out_var_SV_Target0 UserSemantic "SV_Target0"
OpDecorate %in_var_TEXCOORD0 Location 0
OpDecorate %out_var_SV_Target0 Location 0
OpDecorate %g_depthTexture DescriptorSet 0
OpDecorate %g_depthTexture Binding 0
OpDecorate %g_sampler DescriptorSet 0
OpDecorate %g_sampler Binding 0
OpDecorate %g_comp DescriptorSet 0
OpDecorate %g_comp Binding 1
OpDecorateString %g_depthTexture UserTypeGOOGLE "texture2d"
%float = OpTypeFloat 32
%float_0_5 = OpConstant %float 0.5
%int = OpTypeInt 32 1
%int_0 = OpConstant %int 0
%v2int = OpTypeVector %int 2
%16 = OpConstantComposite %v2int %int_0 %int_0
%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
%v4float = OpTypeVector %float 4
%_ptr_Input_v4float = OpTypePointer Input %v4float
%v2float = OpTypeVector %float 2
%_ptr_Input_v2float = OpTypePointer Input %v2float
%_ptr_Output_v4float = OpTypePointer Output %v4float
%void = OpTypeVoid
%25 = OpTypeFunction %void
%type_sampled_image = OpTypeSampledImage %type_2d_image
%g_depthTexture = OpVariable %_ptr_UniformConstant_type_2d_image UniformConstant
%g_sampler = OpVariable %_ptr_UniformConstant_type_sampler UniformConstant
%g_comp = OpVariable %_ptr_UniformConstant_type_sampler UniformConstant
%gl_FragCoord = OpVariable %_ptr_Input_v4float Input
%in_var_TEXCOORD0 = OpVariable %_ptr_Input_v2float Input
%out_var_SV_Target0 = OpVariable %_ptr_Output_v4float Output
%psMain = OpFunction %void None %25
%26 = OpLabel
%27 = OpLoad %v2float %in_var_TEXCOORD0
%28 = OpLoad %type_2d_image %g_depthTexture
%29 = OpLoad %type_sampler %g_comp
%30 = OpSampledImage %type_sampled_image %28 %29
%31 = OpImageDrefGather %v4float %30 %27 %float_0_5 None
%32 = OpLoad %type_sampler %g_sampler
%33 = OpSampledImage %type_sampled_image %28 %32
%34 = OpImageGather %v4float %33 %27 %int_0 ConstOffset %16
%35 = OpFMul %v4float %31 %34
OpStore %out_var_SV_Target0 %35
OpReturn
OpFunctionEnd

5
spirv_msl.cpp
View File

@ -8792,7 +8792,10 @@ string CompilerMSL::to_function_args(const TextureFunctionArguments &args, bool
if (!msl_options.swizzle_texture_samples || is_dynamic_img_sampler)
{
forward = forward && should_forward(args.component);
farg_str += ", " + to_component_argument(args.component);
if (const auto *var = maybe_get_backing_variable(img))
if (!image_is_comparison(get<SPIRType>(var->basetype), var->self))
farg_str += ", " + to_component_argument(args.component);
}
}