Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

fix depth function

Browse Source
This commit is contained in:
ExMatics HydrogenC
2024-06-04 23:22:41 +08:00
parent 9bb6104cf7
commit 463c8dba0d
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Graphics/Materials/DeferredMaterialShader.cpp
+2 -2
View File
@@ -196,7 +196,7 @@ bool DeferredMaterialShader::Load()
// Motion Vectors pass // Motion Vectors pass
psDesc.DepthWriteEnable = false; psDesc.DepthWriteEnable = false;
psDesc.DepthEnable = true; psDesc.DepthEnable = true;
psDesc.DepthFunc = ComparisonFunc::LessEqual; psDesc.DepthFunc = ComparisonFunc::GreaterEqual;
psDesc.VS = _shader->GetVS("VS"); psDesc.VS = _shader->GetVS("VS");
psDesc.PS = _shader->GetPS("PS_MotionVectors"); psDesc.PS = _shader->GetPS("PS_MotionVectors");
_cache.MotionVectors.Init(psDesc); _cache.MotionVectors.Init(psDesc);
@@ -214,7 +214,7 @@ bool DeferredMaterialShader::Load()
psDesc.DepthClipEnable = false; psDesc.DepthClipEnable = false;
psDesc.DepthWriteEnable = true; psDesc.DepthWriteEnable = true;
psDesc.DepthEnable = true; psDesc.DepthEnable = true;
psDesc.DepthFunc = ComparisonFunc::Less; psDesc.DepthFunc = ComparisonFunc::Greater;
psDesc.HS = nullptr; psDesc.HS = nullptr;
psDesc.DS = nullptr; psDesc.DS = nullptr;
GPUShaderProgramVS* instancedDepthPassVS; GPUShaderProgramVS* instancedDepthPassVS;
Source/Engine/Graphics/Materials/DeformableMaterialShader.cpp
+1 -1
View File
@@ -173,7 +173,7 @@ bool DeformableMaterialShader::Load()
psDesc.DepthClipEnable = false; psDesc.DepthClipEnable = false;
psDesc.DepthWriteEnable = true; psDesc.DepthWriteEnable = true;
psDesc.DepthEnable = true; psDesc.DepthEnable = true;
psDesc.DepthFunc = ComparisonFunc::Less; psDesc.DepthFunc = ComparisonFunc::Greater;
psDesc.HS = nullptr; psDesc.HS = nullptr;
psDesc.DS = nullptr; psDesc.DS = nullptr;
_cache.Depth.Init(psDesc); _cache.Depth.Init(psDesc);
Source/Engine/Graphics/Materials/ForwardMaterialShader.cpp
+1 -1
View File
@@ -205,7 +205,7 @@ bool ForwardMaterialShader::Load()
psDesc.DepthClipEnable = false; psDesc.DepthClipEnable = false;
psDesc.DepthWriteEnable = true; psDesc.DepthWriteEnable = true;
psDesc.DepthEnable = true; psDesc.DepthEnable = true;
psDesc.DepthFunc = ComparisonFunc::Less; psDesc.DepthFunc = ComparisonFunc::Greater;
psDesc.HS = nullptr; psDesc.HS = nullptr;
psDesc.DS = nullptr; psDesc.DS = nullptr;
psDesc.VS = _shader->GetVS("VS"); psDesc.VS = _shader->GetVS("VS");
Source/Engine/Graphics/Materials/TerrainMaterialShader.cpp
+1 -1
View File
@@ -185,7 +185,7 @@ bool TerrainMaterialShader::Load()
psDesc.DepthClipEnable = false; psDesc.DepthClipEnable = false;
psDesc.DepthWriteEnable = true; psDesc.DepthWriteEnable = true;
psDesc.DepthEnable = true; psDesc.DepthEnable = true;
psDesc.DepthFunc = ComparisonFunc::Less; psDesc.DepthFunc = ComparisonFunc::Greater;
psDesc.HS = nullptr; psDesc.HS = nullptr;
psDesc.DS = nullptr; psDesc.DS = nullptr;
// TODO: masked terrain materials (depth pass should clip holes) // TODO: masked terrain materials (depth pass should clip holes)
Source/Shaders/SSAO.shader
+1 -1
View File
@@ -275,7 +275,7 @@ void PrepareDepthMip(const float4 inPos, int mipLevel, out float outD0, out floa
{ {
float4 depths = depthsArr[i]; float4 depths = depthsArr[i];
float closest = max(max(depths.x, depths.y), max(depths.z, depths.w)); float closest = min(min(depths.x, depths.y), min(depths.z, depths.w));
CalculateRadiusParameters(abs(closest), 1.0, dummyUnused1, dummyUnused2, falloffCalcMulSq); CalculateRadiusParameters(abs(closest), 1.0, dummyUnused1, dummyUnused2, falloffCalcMulSq);
Source/Shaders/Shadows.shader
+1 -1
View File
@@ -44,7 +44,7 @@ float RayCastScreenSpaceShadow(GBufferData gBufferData, GBufferSample gBuffer, f
float3 rayUV = rayCS.xyz / rayCS.w; float3 rayUV = rayCS.xyz / rayCS.w;
rayUV.xy = rayUV.xy * float2(0.5, -0.5) + float2(0.5, 0.5); rayUV.xy = rayUV.xy * float2(0.5, -0.5) + float2(0.5, 0.5);
float sceneDepth = SampleDepth(gBufferData, rayUV.xy) * gBufferData.ViewFar; float sceneDepth = SampleDepth(gBufferData, rayUV.xy) * gBufferData.ViewFar;
float rayDepth = LinearizeZ(rayUV.z) * gBufferData.ViewFar * 0.998; float rayDepth = LinearizeZ(gBufferData, rayUV.z) * gBufferData.ViewFar * 0.998;
float surfaceThickness = 0.035f + rayDepth * rayLength; float surfaceThickness = 0.035f + rayDepth * rayLength;
float depthTestHardness = 0.005f; float depthTestHardness = 0.005f;
float lightAmount = saturate((rayDepth - sceneDepth) / depthTestHardness) * saturate((sceneDepth + surfaceThickness - rayDepth) / depthTestHardness); float lightAmount = saturate((rayDepth - sceneDepth) / depthTestHardness) * saturate((sceneDepth + surfaceThickness - rayDepth) / depthTestHardness);