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

Merge pull request #1449 from KhronosGroup/fix-1443

Browse Source 
HLSL: Fix FragCoord.w.
This commit is contained in:
Hans-Kristian Arntzen 2020-08-20 19:20:48 +02:00 committed by GitHub
commit 4f0f0e5a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
reference/opt/shaders-hlsl/asm/frag/single-function-private-lut.asm.frag
View File

@ -55,6 +55,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.o_color = o_color;

1
reference/opt/shaders-hlsl/asm/frag/texel-fetch-no-lod.asm.frag
View File

@ -22,6 +22,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;

1
reference/opt/shaders-hlsl/frag/builtins.frag
View File

@ -24,6 +24,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
vColor = stage_input.vColor;
frag_main();
SPIRV_Cross_Output stage_output;

1
reference/opt/shaders-hlsl/frag/complex-expression-in-access-chain.frag
View File

@ -28,6 +28,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
vIn = stage_input.vIn;
vIn2 = stage_input.vIn2;
frag_main();

1
reference/opt/shaders-hlsl/frag/input-attachment-ms.frag
View File

@ -24,6 +24,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
gl_SampleID = stage_input.gl_SampleID;
frag_main();
SPIRV_Cross_Output stage_output;

1
reference/opt/shaders-hlsl/frag/input-attachment.frag
View File

@ -22,6 +22,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;

1
reference/opt/shaders-hlsl/frag/sampler-array.frag
View File

@ -24,6 +24,7 @@ void frag_main()
void main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
vTex = stage_input.vTex;
vIndex = stage_input.vIndex;
frag_main();

1
reference/opt/shaders-hlsl/frag/tex-sampling-ms.frag
View File

@ -26,6 +26,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;

1
reference/opt/shaders-hlsl/frag/texel-fetch-offset.frag
View File

@ -24,6 +24,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;

1
reference/shaders-hlsl-no-opt/asm/frag/pixel-interlock-callstack.sm51.fxconly.asm.frag
View File

@ -28,5 +28,6 @@ void frag_main()
void main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
}

1
reference/shaders-hlsl-no-opt/asm/frag/pixel-interlock-control-flow.sm51.fxconly.asm.frag
View File

@ -38,5 +38,6 @@ void frag_main()
void main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
}

1
reference/shaders-hlsl-no-opt/asm/frag/pixel-interlock-split-functions.sm51.fxconly.asm.frag
View File

@ -38,5 +38,6 @@ void frag_main()
void main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
}

27
reference/shaders-hlsl-no-opt/frag/frag-coord.frag Normal file
View File

@ -0,0 +1,27 @@
static float4 gl_FragCoord;
static float3 FragColor;
struct SPIRV_Cross_Input
{
float4 gl_FragCoord : SV_Position;
};
struct SPIRV_Cross_Output
{
float3 FragColor : SV_Target0;
};
void frag_main()
{
FragColor = gl_FragCoord.xyz / gl_FragCoord.w.xxx;
}
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;
return stage_output;
}

1
reference/shaders-hlsl-no-opt/frag/native-16bit-types.fxconly.nofxc.sm62.native-16bit.frag
View File

@ -66,6 +66,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
Input = stage_input.Input;
InputI = stage_input.InputI;
InputU = stage_input.InputU;

1
reference/shaders-hlsl-no-opt/frag/pixel-interlock-simple-callstack.sm51.fxconly.frag
View File

@ -28,5 +28,6 @@ void frag_main()
void main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
}

1
reference/shaders-hlsl/asm/frag/single-function-private-lut.asm.frag
View File

@ -58,6 +58,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.o_color = o_color;

1
reference/shaders-hlsl/asm/frag/texel-fetch-no-lod.asm.frag
View File

@ -22,6 +22,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;

1
reference/shaders-hlsl/frag/builtins.frag
View File

@ -24,6 +24,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
vColor = stage_input.vColor;
frag_main();
SPIRV_Cross_Output stage_output;

1
reference/shaders-hlsl/frag/complex-expression-in-access-chain.frag
View File

@ -31,6 +31,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
vIn = stage_input.vIn;
vIn2 = stage_input.vIn2;
frag_main();

1
reference/shaders-hlsl/frag/input-attachment-ms.frag
View File

@ -30,6 +30,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
gl_SampleID = stage_input.gl_SampleID;
frag_main();
SPIRV_Cross_Output stage_output;

1
reference/shaders-hlsl/frag/input-attachment.frag
View File

@ -27,6 +27,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;

1
reference/shaders-hlsl/frag/sampler-array.frag
View File

@ -38,6 +38,7 @@ void frag_main()
void main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
vTex = stage_input.vTex;
vIndex = stage_input.vIndex;
frag_main();

1
reference/shaders-hlsl/frag/tex-sampling-ms.frag
View File

@ -25,6 +25,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;

1
reference/shaders-hlsl/frag/texel-fetch-offset.frag
View File

@ -23,6 +23,7 @@ void frag_main()
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
gl_FragCoord = stage_input.gl_FragCoord;
gl_FragCoord.w = 1.0 / gl_FragCoord.w;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;

8
shaders-hlsl-no-opt/frag/frag-coord.frag Normal file
View File

@ -0,0 +1,8 @@
#version 450
layout(location = 0) out vec3 FragColor;
void main()
{
FragColor = gl_FragCoord.xyz / gl_FragCoord.w;
}

4
spirv_hlsl.cpp
View File

@ -2396,7 +2396,11 @@ void CompilerHLSL::emit_hlsl_entry_point()
if (legacy)
statement(builtin, " = stage_input.", builtin, " + float4(0.5f, 0.5f, 0.0f, 0.0f);");
else
{
statement(builtin, " = stage_input.", builtin, ";");
// ZW are undefined in D3D9, only do this fixup here.
statement(builtin, ".w = 1.0 / ", builtin, ".w;");
}
break;
case BuiltInVertexId: