GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'debugshader' of https://github.com/Withaust/FlaxEngine into Withaust-debugshader

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-07 10:53:54 +02:00
parent fae6a1ebe9 42a9eaf72e
commit 7c6148dfd8
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Debug/DebugDraw.cpp
View File

@@ -632,9 +632,10 @@ void DebugDrawService::Update()
desc.VS = shader->GetVS("VS"); desc.VS = shader->GetVS("VS");
// Default // Default
desc.PS = shader->GetPS("PS"); desc.PS = shader->GetPS("PSUnlit");
desc.PrimitiveTopologyType = PrimitiveTopologyType::Line; desc.PrimitiveTopologyType = PrimitiveTopologyType::Line;
failed |= DebugDrawPsLinesDefault.Create(desc); failed |= DebugDrawPsLinesDefault.Create(desc);
desc.PS = shader->GetPS("PS");
desc.PrimitiveTopologyType = PrimitiveTopologyType::Triangle; desc.PrimitiveTopologyType = PrimitiveTopologyType::Triangle;
failed |= DebugDrawPsTrianglesDefault.Create(desc); failed |= DebugDrawPsTrianglesDefault.Create(desc);
desc.Wireframe = true; desc.Wireframe = true;
@@ -642,9 +643,10 @@ void DebugDrawService::Update()
// Depth Test // Depth Test
desc.Wireframe = false; desc.Wireframe = false;
desc.PS = shader->GetPS("PS_DepthTest"); desc.PS = shader->GetPS("PS_DepthTestUnlit");
desc.PrimitiveTopologyType = PrimitiveTopologyType::Line; desc.PrimitiveTopologyType = PrimitiveTopologyType::Line;
failed |= DebugDrawPsLinesDepthTest.Create(desc); failed |= DebugDrawPsLinesDepthTest.Create(desc);
desc.PS = shader->GetPS("PS_DepthTest");
desc.PrimitiveTopologyType = PrimitiveTopologyType::Triangle; desc.PrimitiveTopologyType = PrimitiveTopologyType::Triangle;
failed |= DebugDrawPsTrianglesDepthTest.Create(desc); failed |= DebugDrawPsTrianglesDepthTest.Create(desc);
desc.Wireframe = true; desc.Wireframe = true;

13
Source/Shaders/DebugDraw.shader
View File

@@ -54,9 +54,22 @@ float4 PS(VS2PS input) : SV_Target
return PerformFakeLighting(input.Position, input.Color); return PerformFakeLighting(input.Position, input.Color);
} }
META_PS(true, FEATURE_LEVEL_ES2)
float4 PSUnlit(VS2PS input) : SV_Target
{
return input.Color;
}
META_PS(true, FEATURE_LEVEL_ES2) META_PS(true, FEATURE_LEVEL_ES2)
float4 PS_DepthTest(VS2PS input) : SV_Target float4 PS_DepthTest(VS2PS input) : SV_Target
{ {
PerformDepthTest(input.Position); PerformDepthTest(input.Position);
return PerformFakeLighting(input.Position, input.Color); return PerformFakeLighting(input.Position, input.Color);
} }
META_PS(true, FEATURE_LEVEL_ES2)
float4 PS_DepthTestUnlit(VS2PS input) : SV_Target
{
PerformDepthTest(input.Position);
return input.Color;
}