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

MSL: Force disabled fragment builtins to have the right name.

Browse Source 
DXVK emits SPIR-V where fragment shader builtins have names derived from
DXBC assembly, e.g. `oDepth` for `FragDepth`. When we declared the
disabled output, we used this name, but when referencing it, we
continued to use the GLSL name. This breaks compilation.
This commit is contained in:
Chip Davis 2020-04-15 19:22:16 -05:00
parent fbc560782c
commit 96f7008aa8
4 changed files with 156 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
reference/opt/shaders-msl/asm/frag/disable-renamed-output.frag-output.asm.frag Normal file
View File

@ -0,0 +1,35 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 o1 [[color(1)]];
float4 o3 [[color(3)]];
float4 o6 [[color(6)]];
float4 o7 [[color(7)]];
};
fragment main0_out main0()
{
float4 o0;
float4 o2;
float4 o4;
float4 o5;
float gl_FragDepth;
int gl_FragStencilRefARB;
main0_out out = {};
o0 = float4(0.0, 0.0, 0.0, 1.0);
out.o1 = float4(1.0, 0.0, 0.0, 1.0);
o2 = float4(0.0, 1.0, 0.0, 1.0);
out.o3 = float4(0.0, 0.0, 1.0, 1.0);
o4 = float4(1.0, 0.0, 1.0, 0.5);
o5 = float4(0.25);
out.o6 = float4(0.75);
out.o7 = float4(1.0);
gl_FragDepth = 0.89999997615814208984375;
gl_FragStencilRefARB = uint(127);
return out;
}

35
reference/shaders-msl/asm/frag/disable-renamed-output.frag-output.asm.frag Normal file
View File

@ -0,0 +1,35 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 o1 [[color(1)]];
float4 o3 [[color(3)]];
float4 o6 [[color(6)]];
float4 o7 [[color(7)]];
};
fragment main0_out main0()
{
float4 o0;
float4 o2;
float4 o4;
float4 o5;
float gl_FragDepth;
int gl_FragStencilRefARB;
main0_out out = {};
o0 = float4(0.0, 0.0, 0.0, 1.0);
out.o1 = float4(1.0, 0.0, 0.0, 1.0);
o2 = float4(0.0, 1.0, 0.0, 1.0);
out.o3 = float4(0.0, 0.0, 1.0, 1.0);
o4 = float4(1.0, 0.0, 1.0, 0.5);
o5 = float4(0.25);
out.o6 = float4(0.75);
out.o7 = float4(1.0);
gl_FragDepth = 0.89999997615814208984375;
gl_FragStencilRefARB = uint(127);
return out;
}

83
shaders-msl/asm/frag/disable-renamed-output.frag-output.asm.frag Normal file
View File

@ -0,0 +1,83 @@
; SPIR-V
; Version: 1.3
; Generator: Khronos Glslang Reference Front End; 8
; Bound: 37
; Schema: 0
OpCapability Shader
OpCapability StencilExportEXT
OpExtension "SPV_EXT_shader_stencil_export"
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %o0 %o1 %o2 %o3 %o4 %o5 %o6 %o7 %oDepth %oStencil
OpExecutionMode %main OriginUpperLeft
OpExecutionMode %main DepthReplacing
OpSource GLSL 450
OpSourceExtension "GL_ARB_shader_stencil_export"
OpName %main "main"
OpName %o0 "o0"
OpName %o1 "o1"
OpName %o2 "o2"
OpName %o3 "o3"
OpName %o4 "o4"
OpName %o5 "o5"
OpName %o6 "o6"
OpName %o7 "o7"
OpName %oDepth "oDepth"
OpName %oStencil "oStencil"
OpDecorate %o0 Location 0
OpDecorate %o1 Location 1
OpDecorate %o2 Location 2
OpDecorate %o3 Location 3
OpDecorate %o4 Location 4
OpDecorate %o5 Location 5
OpDecorate %o6 Location 6
OpDecorate %o7 Location 7
OpDecorate %oDepth BuiltIn FragDepth
OpDecorate %oStencil BuiltIn FragStencilRefEXT
%void = OpTypeVoid
%3 = OpTypeFunction %void
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
%o0 = OpVariable %_ptr_Output_v4float Output
%float_0 = OpConstant %float 0
%float_1 = OpConstant %float 1
%12 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_1
%o1 = OpVariable %_ptr_Output_v4float Output
%14 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
%o2 = OpVariable %_ptr_Output_v4float Output
%16 = OpConstantComposite %v4float %float_0 %float_1 %float_0 %float_1
%o3 = OpVariable %_ptr_Output_v4float Output
%18 = OpConstantComposite %v4float %float_0 %float_0 %float_1 %float_1
%o4 = OpVariable %_ptr_Output_v4float Output
%float_0_5 = OpConstant %float 0.5
%21 = OpConstantComposite %v4float %float_1 %float_0 %float_1 %float_0_5
%o5 = OpVariable %_ptr_Output_v4float Output
%float_0_25 = OpConstant %float 0.25
%24 = OpConstantComposite %v4float %float_0_25 %float_0_25 %float_0_25 %float_0_25
%o6 = OpVariable %_ptr_Output_v4float Output
%float_0_75 = OpConstant %float 0.75
%27 = OpConstantComposite %v4float %float_0_75 %float_0_75 %float_0_75 %float_0_75
%o7 = OpVariable %_ptr_Output_v4float Output
%29 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
%_ptr_Output_float = OpTypePointer Output %float
%oDepth = OpVariable %_ptr_Output_float Output
%float_0_899999976 = OpConstant %float 0.899999976
%int = OpTypeInt 32 1
%_ptr_Output_int = OpTypePointer Output %int
%oStencil = OpVariable %_ptr_Output_int Output
%int_127 = OpConstant %int 127
%main = OpFunction %void None %3
%5 = OpLabel
OpStore %o0 %12
OpStore %o1 %14
OpStore %o2 %16
OpStore %o3 %18
OpStore %o4 %21
OpStore %o5 %24
OpStore %o6 %27
OpStore %o7 %29
OpStore %oDepth %float_0_899999976
OpStore %oStencil %int_127
OpReturn
OpFunctionEnd

3
spirv_msl.cpp
View File

@ -2488,6 +2488,9 @@ uint32_t CompilerMSL::add_interface_block(StorageClass storage, bool patch)
{
hidden = true;
disabled_frag_outputs.push_back(var_id);
// If a builtin, force it to have the proper name.
if (is_builtin)
set_name(var_id, builtin_to_glsl(bi_type, StorageClassFunction));
}
// Barycentric inputs must be emitted in stage-in, because they can have interpolation arguments.