From 696f92e47c8a4bfb56bd0401ab350b79294d5652 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 1 Jun 2026 20:15:27 +0100 Subject: [PATCH] Add renderer overdraw debug view --- .../GraphicsSettings.cs | 2 +- src/Aquarium.Engine/Render/D3D12Renderer.cs | 98 +++++++++++++++++-- .../Shaders/D3D12FractalSplatRender.hlsl | 2 + .../Render/Shaders/D3D12PointCloud.hlsl | 2 + .../Render/Shaders/D3D12Post.hlsl | 17 +++- .../Render/Shaders/D3D12Scene.hlsl | 3 + .../Render/Shaders/D3D12SdfCommon.hlsli | 1 + .../Render/Shaders/D3D12SdfProxy.hlsli | 1 + .../Render/Shaders/D3D12TemporalGaussian.hlsl | 2 + .../Render/Shaders/D3D12TubeField.hlsl | 2 + state/evidence.jsonl | 1 + 11 files changed, 120 insertions(+), 11 deletions(-) diff --git a/src/Aquarium.Engine.Contracts/GraphicsSettings.cs b/src/Aquarium.Engine.Contracts/GraphicsSettings.cs index 7ef15ff..35022a1 100644 --- a/src/Aquarium.Engine.Contracts/GraphicsSettings.cs +++ b/src/Aquarium.Engine.Contracts/GraphicsSettings.cs @@ -10,7 +10,7 @@ public readonly record struct GraphicsSettings( float FieldReservoirSpatialReuseBudget) { public const int MinRenderDebugMode = 0; - public const int MaxRenderDebugMode = 20; + public const int MaxRenderDebugMode = 21; public const int FieldReservoirModeNativeDomain = 0; public const int FieldReservoirModeTexelBaseline = 1; public const float MinFieldReservoirScale = 0.25f; diff --git a/src/Aquarium.Engine/Render/D3D12Renderer.cs b/src/Aquarium.Engine/Render/D3D12Renderer.cs index 10c5892..6bc700e 100644 --- a/src/Aquarium.Engine/Render/D3D12Renderer.cs +++ b/src/Aquarium.Engine/Render/D3D12Renderer.cs @@ -53,6 +53,7 @@ public sealed class D3D12Renderer : IAquariumRenderer private const float SurfaceTransparentMaxZ = 0.45f; private const int BloomLevelCount = 8; private const Format SceneHdrFormat = Format.R16G16B16A16_Float; + private const Format SceneOverdrawFormat = Format.R16_Float; private const string StudioPmremRelativePath = "Assets/Textures/studio3_pmrem.dds"; private const string StudioIrradianceRelativePath = "Assets/Textures/studio3_irradiance.dds"; private const string ProgramOutputEnabledEnvironmentVariable = "FENSALIR_PROGRAM_OUTPUT_D3D12"; @@ -87,6 +88,7 @@ public sealed class D3D12Renderer : IAquariumRenderer private const int RootReservoirResolvedOutput = 20; private const int RootTubeFieldReplayManifest = 21; private const int RootTubeFieldReplaySources = 22; + private const int RootSceneOverdraw = 23; private const int RootFusionFrameConstants = 0; private const int RootFusionSeeds = 1; private const int RootFusionSensorCameras = 2; @@ -150,6 +152,15 @@ public sealed class D3D12Renderer : IAquariumRenderer new(18, "Reservoir Shift"), new(19, "Reservoir Disocclusion"), new(20, "Reservoir Spatial Budget"), + new(21, "Overdraw"), + ]; + private static readonly Format[] SceneEvidenceRenderTargetFormats = + [ + SceneHdrFormat, + SceneHdrFormat, + SceneHdrFormat, + SceneHdrFormat, + SceneOverdrawFormat, ]; private static readonly DebugUi.DebugUiOption[] FieldReservoirModeOptions = [ @@ -241,6 +252,7 @@ public sealed class D3D12Renderer : IAquariumRenderer private D3D12RenderTarget sceneCandidateMetadataRenderTarget; private D3D12RenderTarget sceneCandidateControlRenderTarget; private D3D12RenderTarget sceneCandidateReservoirGuideRenderTarget; + private D3D12RenderTarget sceneOverdrawRenderTarget; private D3D12RenderTarget reservoirResolvedRenderTarget; private readonly Dictionary graphRenderTargets = new(StringComparer.Ordinal); private D3D12TrackedResource sceneDepthTarget; @@ -469,6 +481,7 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneCandidateMetadataRenderTarget = CreateSceneAuxiliaryRenderTarget("scene-candidate-metadata-target", "Aquarium D3D12 Scene Candidate Metadata Target"); sceneCandidateControlRenderTarget = CreateSceneAuxiliaryRenderTarget("scene-candidate-control-target", "Aquarium D3D12 Scene Candidate Control Target"); sceneCandidateReservoirGuideRenderTarget = CreateSceneAuxiliaryRenderTarget("scene-candidate-reservoir-guide-target", "Aquarium D3D12 Scene Candidate Reservoir Guide Target"); + sceneOverdrawRenderTarget = CreateSceneOverdrawRenderTarget(); reservoirResolvedRenderTarget = CreateReservoirResolvedRenderTarget(); sceneDepthStencilView = depthStencilViewArena.Allocate(); sceneDepthTarget = CreateSceneDepthTarget(sceneDepthStencilView); @@ -1378,6 +1391,8 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneCandidateControlRenderTarget.CreateShaderResourceView(device, frameResources.SceneCandidateControlDescriptor); frameResources.SceneCandidateReservoirGuideDescriptor = frameResources.TransientShaderDescriptors.Allocate(); sceneCandidateReservoirGuideRenderTarget.CreateShaderResourceView(device, frameResources.SceneCandidateReservoirGuideDescriptor); + frameResources.SceneOverdrawDescriptor = frameResources.TransientShaderDescriptors.Allocate(); + sceneOverdrawRenderTarget.CreateShaderResourceView(device, frameResources.SceneOverdrawDescriptor); frameResources.ReservoirResolvedDescriptor = frameResources.TransientShaderDescriptors.Allocate(); reservoirResolvedRenderTarget.CreateShaderResourceView(device, frameResources.ReservoirResolvedDescriptor); frameResources.ReservoirResolvedUnorderedAccessDescriptor = frameResources.TransientShaderDescriptors.Allocate(); @@ -1656,6 +1671,7 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneCandidateControlRenderTarget.Dispose(); sceneCandidateMetadataRenderTarget.Dispose(); sceneCandidateRenderTarget.Dispose(); + sceneOverdrawRenderTarget.Dispose(); reservoirResolvedRenderTarget.Dispose(); sceneDepthTarget.Dispose(); heightFieldRenderTarget.Dispose(); @@ -2376,6 +2392,7 @@ public sealed class D3D12Renderer : IAquariumRenderer resourceRegistry.RemoveRenderTarget("scene-candidate-metadata-target"); resourceRegistry.RemoveRenderTarget("scene-candidate-control-target"); resourceRegistry.RemoveRenderTarget("scene-candidate-reservoir-guide-target"); + resourceRegistry.RemoveRenderTarget("scene-overdraw-target"); resourceRegistry.RemoveRenderTarget("reservoir-resolved-target"); resourceRegistry.RemoveResource("scene-depth-target"); resourceRegistry.RemoveRenderTarget("height-field-target"); @@ -2389,6 +2406,7 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneCandidateMetadataRenderTarget.Dispose(); sceneCandidateControlRenderTarget.Dispose(); sceneCandidateReservoirGuideRenderTarget.Dispose(); + sceneOverdrawRenderTarget.Dispose(); reservoirResolvedRenderTarget.Dispose(); fieldReservoirCandidateBuffer.Dispose(); fieldReservoirLockBuffer.Dispose(); @@ -2425,6 +2443,7 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneCandidateMetadataRenderTarget = CreateSceneAuxiliaryRenderTarget("scene-candidate-metadata-target", "Aquarium D3D12 Scene Candidate Metadata Target"); sceneCandidateControlRenderTarget = CreateSceneAuxiliaryRenderTarget("scene-candidate-control-target", "Aquarium D3D12 Scene Candidate Control Target"); sceneCandidateReservoirGuideRenderTarget = CreateSceneAuxiliaryRenderTarget("scene-candidate-reservoir-guide-target", "Aquarium D3D12 Scene Candidate Reservoir Guide Target"); + sceneOverdrawRenderTarget = CreateSceneOverdrawRenderTarget(); reservoirResolvedRenderTarget = CreateReservoirResolvedRenderTarget(); CreateFieldReservoirBuffers(); sceneDepthStencilView = depthStencilViewArena.Allocate(); @@ -2464,6 +2483,7 @@ public sealed class D3D12Renderer : IAquariumRenderer resourceRegistry.RemoveRenderTarget("scene-candidate-metadata-target"); resourceRegistry.RemoveRenderTarget("scene-candidate-control-target"); resourceRegistry.RemoveRenderTarget("scene-candidate-reservoir-guide-target"); + resourceRegistry.RemoveRenderTarget("scene-overdraw-target"); resourceRegistry.RemoveRenderTarget("reservoir-resolved-target"); resourceRegistry.RemoveResource("scene-depth-target"); DisposeBloomRenderTargets(); @@ -2475,6 +2495,7 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneCandidateMetadataRenderTarget.Dispose(); sceneCandidateControlRenderTarget.Dispose(); sceneCandidateReservoirGuideRenderTarget.Dispose(); + sceneOverdrawRenderTarget.Dispose(); reservoirResolvedRenderTarget.Dispose(); fieldReservoirCandidateBuffer.Dispose(); fieldReservoirLockBuffer.Dispose(); @@ -2493,6 +2514,7 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneCandidateMetadataRenderTarget = CreateSceneAuxiliaryRenderTarget("scene-candidate-metadata-target", "Aquarium D3D12 Scene Candidate Metadata Target"); sceneCandidateControlRenderTarget = CreateSceneAuxiliaryRenderTarget("scene-candidate-control-target", "Aquarium D3D12 Scene Candidate Control Target"); sceneCandidateReservoirGuideRenderTarget = CreateSceneAuxiliaryRenderTarget("scene-candidate-reservoir-guide-target", "Aquarium D3D12 Scene Candidate Reservoir Guide Target"); + sceneOverdrawRenderTarget = CreateSceneOverdrawRenderTarget(); reservoirResolvedRenderTarget = CreateReservoirResolvedRenderTarget(); CreateFieldReservoirBuffers(); sceneDepthTarget = CreateSceneDepthTarget(sceneDepthStencilView); @@ -2541,6 +2563,23 @@ public sealed class D3D12Renderer : IAquariumRenderer return target; } + private D3D12RenderTarget CreateSceneOverdrawRenderTarget() + { + var target = new D3D12RenderTarget( + device, + reservoirWidth, + reservoirHeight, + SceneOverdrawFormat, + renderTargetViewArena.Allocate(), + staticShaderDescriptorArena.Allocate(), + null, + false, + new Color4(0.0f, 0.0f, 0.0f, 1.0f), + "Aquarium D3D12 Scene Overdraw Target"); + resourceRegistry.Add("scene-overdraw-target", target); + return target; + } + private D3D12RenderTarget CreateReservoirResolvedRenderTarget() { var target = new D3D12RenderTarget( @@ -2933,11 +2972,13 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneCandidateMetadataRenderTarget.Transition(context.CommandList, ResourceStates.RenderTarget); sceneCandidateControlRenderTarget.Transition(context.CommandList, ResourceStates.RenderTarget); sceneCandidateReservoirGuideRenderTarget.Transition(context.CommandList, ResourceStates.RenderTarget); + sceneOverdrawRenderTarget.Transition(context.CommandList, ResourceStates.RenderTarget); sceneDepthTarget.Transition(context.CommandList, ResourceStates.DepthWrite); context.CommandList.ClearRenderTargetView(sceneCandidateRenderTarget.RenderTargetView.Cpu, new Color4(0.0f, 0.0f, 0.0f, 1.0f)); context.CommandList.ClearRenderTargetView(sceneCandidateMetadataRenderTarget.RenderTargetView.Cpu, new Color4(0.0f, 0.0f, 0.0f, 1.0f)); context.CommandList.ClearRenderTargetView(sceneCandidateControlRenderTarget.RenderTargetView.Cpu, new Color4(0.0f, 0.0f, 0.0f, 1.0f)); context.CommandList.ClearRenderTargetView(sceneCandidateReservoirGuideRenderTarget.RenderTargetView.Cpu, new Color4(1.0f, 0.0f, 1.0f, 0.0f)); + context.CommandList.ClearRenderTargetView(sceneOverdrawRenderTarget.RenderTargetView.Cpu, new Color4(0.0f, 0.0f, 0.0f, 1.0f)); context.CommandList.ClearDepthStencilView(sceneDepthStencilView.Cpu, ClearFlags.Depth, 1.0f, 0); context.CommandList.SetDescriptorHeaps(frameResources.TransientShaderDescriptors.Heap); ClearFieldReservoir(context.CommandList, frameResources); @@ -2960,6 +3001,7 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneCandidateMetadataRenderTarget.RenderTargetView.Cpu, sceneCandidateControlRenderTarget.RenderTargetView.Cpu, sceneCandidateReservoirGuideRenderTarget.RenderTargetView.Cpu, + sceneOverdrawRenderTarget.RenderTargetView.Cpu, ], sceneDepthStencilView.Cpu); context.CommandList.IASetPrimitiveTopology(PrimitiveTopology.TriangleList); @@ -3556,6 +3598,7 @@ public sealed class D3D12Renderer : IAquariumRenderer sceneMetadataRenderTarget.Transition(context.CommandList, ResourceStates.PixelShaderResource); sceneControlRenderTarget.Transition(context.CommandList, ResourceStates.PixelShaderResource); sceneReservoirGuideRenderTarget.Transition(context.CommandList, ResourceStates.PixelShaderResource); + sceneOverdrawRenderTarget.Transition(context.CommandList, ResourceStates.PixelShaderResource); context.BackBuffer.Transition(context.CommandList, ResourceStates.RenderTarget); context.CommandList.SetDescriptorHeaps(frameResources.TransientShaderDescriptors.Heap); @@ -3570,6 +3613,7 @@ public sealed class D3D12Renderer : IAquariumRenderer context.CommandList.SetGraphicsRootDescriptorTable(RootTemporalGaussians, frameResources.TemporalGaussianDescriptor.Gpu); context.CommandList.SetGraphicsRootDescriptorTable(RootCurrentReservoirGuide, frameResources.SceneReservoirGuideDescriptor.Gpu); context.CommandList.SetGraphicsRootDescriptorTable(RootBlueNoise, frameResources.BlueNoiseDescriptor.Gpu); + context.CommandList.SetGraphicsRootDescriptorTable(RootSceneOverdraw, frameResources.SceneOverdrawDescriptor.Gpu); context.CommandList.RSSetViewports(viewport); context.CommandList.RSSetScissorRects(scissorRect); @@ -5720,6 +5764,12 @@ public sealed class D3D12Renderer : IAquariumRenderer 60, 0, D3D12.DescriptorRangeOffsetAppend); + var sceneOverdrawRange = new DescriptorRange( + DescriptorRangeType.ShaderResourceView, + 1, + 76, + 0, + D3D12.DescriptorRangeOffsetAppend); var rootParameters = new[] { new RootParameter(new RootDescriptorTable([constantBufferRange]), ShaderVisibility.All), @@ -5745,6 +5795,7 @@ public sealed class D3D12Renderer : IAquariumRenderer new RootParameter(new RootDescriptorTable([reservoirResolvedOutputRange]), ShaderVisibility.All), new RootParameter(RootParameterType.ShaderResourceView, new RootDescriptor(59, 0), ShaderVisibility.All), new RootParameter(new RootDescriptorTable([tubeFieldReplaySourceRange]), ShaderVisibility.All), + new RootParameter(new RootDescriptorTable([sceneOverdrawRange]), ShaderVisibility.Pixel), }; var staticSamplers = new[] { @@ -6061,7 +6112,7 @@ public sealed class D3D12Renderer : IAquariumRenderer private ID3D12PipelineState CreateScenePipelineState(string path) { - return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12ScenePS", [SceneHdrFormat, SceneHdrFormat, SceneHdrFormat, SceneHdrFormat], enableDepth: true); + return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12ScenePS", SceneEvidenceRenderTargetFormats, CreateSceneEvidenceBlend(), enableDepth: true); } private ID3D12PipelineState CreateSplinePipelineState(string path) @@ -6069,6 +6120,7 @@ public sealed class D3D12Renderer : IAquariumRenderer var vertexShader = CompileShader(path, "D3D12SplineVS", "vs_5_0"); var pixelShader = CompileShader(path, "D3D12SplinePS", "ps_5_0"); var blend = BlendDescription.Opaque; + blend.IndependentBlendEnable = true; for (var index = 1; index < 8; index++) { blend.RenderTarget[index] = new RenderTargetBlendDescription( @@ -6083,6 +6135,7 @@ public sealed class D3D12Renderer : IAquariumRenderer LogicOp.Noop, index < 4 ? ColorWriteEnable.All : ColorWriteEnable.None); } + blend.RenderTarget[4] = AdditiveOverdrawBlend(); var description = new GraphicsPipelineStateDescription { @@ -6112,7 +6165,7 @@ public sealed class D3D12Renderer : IAquariumRenderer new InputElementDescription("COLOR", 0, Format.R32G32B32A32_Float, 92, 0), new InputElementDescription("TEXCOORD", 6, Format.R32G32B32A32_Float, 108, 0), ]), - RenderTargetFormats = [SceneHdrFormat, SceneHdrFormat, SceneHdrFormat, SceneHdrFormat], + RenderTargetFormats = SceneEvidenceRenderTargetFormats, SampleDescription = new SampleDescription(1, 0), DepthStencilFormat = SceneDepthFormat, }; @@ -6129,17 +6182,17 @@ public sealed class D3D12Renderer : IAquariumRenderer private ID3D12PipelineState CreateSdfObjectProxyPipelineState(string path) { - return CreateFullscreenPipelineState(path, "D3D12SdfObjectProxyVS", "D3D12SdfProxyPS", [SceneHdrFormat, SceneHdrFormat, SceneHdrFormat, SceneHdrFormat], enableDepth: true); + return CreateFullscreenPipelineState(path, "D3D12SdfObjectProxyVS", "D3D12SdfProxyPS", SceneEvidenceRenderTargetFormats, CreateSceneEvidenceBlend(), enableDepth: true); } private ID3D12PipelineState CreateTemporalGaussianPipelineState(string path) { - return CreateFullscreenPipelineState(path, "D3D12TemporalGaussianVS", "D3D12TemporalGaussianPS", [SceneHdrFormat, SceneHdrFormat, SceneHdrFormat, SceneHdrFormat], enableDepth: true); + return CreateFullscreenPipelineState(path, "D3D12TemporalGaussianVS", "D3D12TemporalGaussianPS", SceneEvidenceRenderTargetFormats, CreateSceneEvidenceBlend(), enableDepth: true); } private ID3D12PipelineState CreateFractalSurfaceSplatRenderPipelineState(string path) { - return CreateFullscreenPipelineState(path, "D3D12FractalSplatVS", "D3D12FractalSurfaceSplatPS", [SceneHdrFormat, SceneHdrFormat, SceneHdrFormat, SceneHdrFormat], enableDepth: true); + return CreateFullscreenPipelineState(path, "D3D12FractalSplatVS", "D3D12FractalSurfaceSplatPS", SceneEvidenceRenderTargetFormats, CreateSceneEvidenceBlend(), enableDepth: true); } private ID3D12PipelineState CreateFractalTransparentSplatRenderPipelineState(string path) @@ -6148,7 +6201,7 @@ public sealed class D3D12Renderer : IAquariumRenderer path, "D3D12FractalSplatVS", "D3D12FractalTransparentSplatPS", - [SceneHdrFormat, SceneHdrFormat, SceneHdrFormat, SceneHdrFormat], + SceneEvidenceRenderTargetFormats, CreateTransparentFieldBlend(), enableDepth: false); } @@ -6195,7 +6248,7 @@ public sealed class D3D12Renderer : IAquariumRenderer RootSignature = fullscreenRootSignature, VertexShader = vertexShader, PixelShader = pixelShader, - BlendState = BlendDescription.Opaque, + BlendState = CreateSceneEvidenceBlend(), RasterizerState = RasterizerDescription.CullNone, DepthStencilState = new DepthStencilDescription { @@ -6213,7 +6266,7 @@ public sealed class D3D12Renderer : IAquariumRenderer new InputElementDescription("TEXCOORD", 0, Format.R32G32_Float, 24, 0), new InputElementDescription("COLOR", 0, Format.R32G32B32A32_Float, 32, 0), ]), - RenderTargetFormats = [SceneHdrFormat, SceneHdrFormat, SceneHdrFormat, SceneHdrFormat], + RenderTargetFormats = SceneEvidenceRenderTargetFormats, SampleDescription = new SampleDescription(1, 0), DepthStencilFormat = SceneDepthFormat, }; @@ -6271,7 +6324,7 @@ public sealed class D3D12Renderer : IAquariumRenderer new InputElementDescription("TEXCOORD", 6, Format.R32G32B32A32_Float, 108, 0), new InputElementDescription("TEXCOORD", 7, Format.R32G32B32A32_Float, 124, 0), ]), - RenderTargetFormats = [SceneHdrFormat, SceneHdrFormat, SceneHdrFormat, SceneHdrFormat], + RenderTargetFormats = SceneEvidenceRenderTargetFormats, SampleDescription = new SampleDescription(1, 0), }; @@ -6296,6 +6349,7 @@ public sealed class D3D12Renderer : IAquariumRenderer LogicOp.Noop, ColorWriteEnable.None); } + blend.RenderTarget[4] = AdditiveOverdrawBlend(); return blend; } @@ -6406,10 +6460,34 @@ public sealed class D3D12Renderer : IAquariumRenderer logicOp: LogicOp.Noop, renderTargetWriteMask: ColorWriteEnable.None); } + blend.RenderTarget[4] = AdditiveOverdrawBlend(); return blend; } + private static BlendDescription CreateSceneEvidenceBlend() + { + var blend = BlendDescription.Opaque; + blend.IndependentBlendEnable = true; + blend.RenderTarget[4] = AdditiveOverdrawBlend(); + return blend; + } + + private static RenderTargetBlendDescription AdditiveOverdrawBlend() + { + return new RenderTargetBlendDescription( + blendEnable: true, + logicOpEnable: false, + srcBlend: Blend.One, + destBlend: Blend.One, + blendOp: BlendOperation.Add, + srcBlendAlpha: Blend.One, + destBlendAlpha: Blend.One, + blendOpAlpha: BlendOperation.Add, + logicOp: LogicOp.Noop, + renderTargetWriteMask: ColorWriteEnable.All); + } + private ID3D12PipelineState CreateFullscreenPipelineState( string path, string vertexEntryPoint, @@ -6921,6 +6999,8 @@ public sealed class D3D12Renderer : IAquariumRenderer public D3D12DescriptorSlot SceneCandidateReservoirGuideDescriptor { get; set; } + public D3D12DescriptorSlot SceneOverdrawDescriptor { get; set; } + public D3D12DescriptorSlot ReservoirResolvedDescriptor { get; set; } public D3D12DescriptorSlot ReservoirResolvedUnorderedAccessDescriptor { get; set; } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12FractalSplatRender.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12FractalSplatRender.hlsl index 08af411..04c6d5c 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12FractalSplatRender.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12FractalSplatRender.hlsl @@ -87,6 +87,7 @@ struct SceneOut float4 metadata : SV_Target1; float4 control : SV_Target2; float4 reservoirGuide : SV_Target3; + float overdraw : SV_Target4; float depth : SV_Depth; }; @@ -237,6 +238,7 @@ SceneOut ResolveFractalSplat(FractalSplatVertexOut input, bool renderTransparent output.metadata = float4(FIELD_ID_FRACTAL_SPLAT_BASE, normal); output.control = float4(opacity, reservoirConfidence, transparentField ? splat.materialConfidence.z / 10.0 : saturate((sdfResident ? sdf.centerRadius.w : splat.centerRadius.w) * 40.0), 0.0); output.reservoirGuide = float4(reservoirConfidence, reservoirSampleAge, domainValidity, 0.0); + output.overdraw = 1.0; output.depth = saturate(input.travel / max(farDistance, 0.0001)); return output; } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12PointCloud.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12PointCloud.hlsl index 5949e04..d7ca078 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12PointCloud.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12PointCloud.hlsl @@ -108,6 +108,7 @@ struct SceneOut float4 metadata : SV_Target1; float4 control : SV_Target2; float4 reservoirGuide : SV_Target3; + float overdraw : SV_Target4; float depth : SV_Depth; }; @@ -285,6 +286,7 @@ SceneOut D3D12PointCloudPS(VertexOut input) output.metadata = float4(FIELD_ID_POINT_CLOUD, normalize(input.normal)); output.control = float4(alpha, 1.0, 0.35, 0.0); output.reservoirGuide = float4(alpha, 0.0, alpha, 0.0); + output.overdraw = 1.0; output.depth = input.position.z / input.position.w; return output; } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl index c708fe9..7ccf90b 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl @@ -42,6 +42,7 @@ Texture2D bloomTexture4 : register(t33); Texture2D bloomTexture5 : register(t34); Texture2D bloomTexture6 : register(t35); Texture2D bloomTexture7 : register(t36); +Texture2D sceneOverdrawTexture : register(t76); Texture2D currentReservoirGuideTexture : register(t26); Texture2D blueNoiseTexture : register(t28); SamplerState sourceSampler : register(s0); @@ -1226,6 +1227,19 @@ float4 reservoirDebugOrColor(FieldReservoirSample candidate, uint2 pixel) return float4(fieldReservoirResolvedColor(candidate, farDistance), candidate.colorTravel.w); } +float3 overdrawHeat(float overdraw) +{ + if (overdraw <= 0.5) + { + return float3(0.0, 0.0, 0.0); + } + + float hot = saturate(log2(max(overdraw, 1.0)) / 4.0); + float3 low = lerp(float3(0.0, 0.22, 0.95), float3(0.0, 0.95, 0.35), saturate(overdraw - 1.0)); + float3 mid = lerp(low, float3(1.0, 0.92, 0.05), saturate((overdraw - 2.0) / 2.0)); + return lerp(mid, float3(1.0, 0.05, 0.35), hot); +} + FieldReservoirResolveOut D3D12FieldReservoirResolvePS(VertexOut input) { uint2 pixel = (uint2)pixelFromUv(input.uv); @@ -1339,7 +1353,8 @@ ResolveOut D3D12ReservoirPresentationResolvePS(VertexOut input) } else if (renderDebugMode >= 20.5 && renderDebugMode < 21.5) { - finalColor = float3(reconstructionMix, currentReservoirConfidence, currentReservoirDomainValidity); + float overdraw = sceneOverdrawTexture.SampleLevel(sourceSampler, input.uv, 0.0); + finalColor = overdrawHeat(overdraw); } else if (renderDebugMode >= 12.5 && renderDebugMode < 18.5) { diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl index 327acec..d9deecf 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl @@ -55,6 +55,7 @@ struct SceneOut float4 metadata : SV_Target1; float4 control : SV_Target2; float4 reservoirGuide : SV_Target3; + float overdraw : SV_Target4; float depth : SV_Depth; }; @@ -408,6 +409,7 @@ SceneOut D3D12ScenePS(VertexOut input) output.metadata = float4(result.fieldId, result.normal); output.control = float4(result.coverage, result.stepCount / 72.0, 0.0, 0.0); output.reservoirGuide = float4(1.0, 0.0, 1.0, 0.0); + output.overdraw = 1.0; output.depth = saturate(result.travel / max(farDistance, 0.001)); return output; } @@ -662,6 +664,7 @@ SceneOut D3D12SplinePS(SplineVertexOut input) output.metadata = float4(5000.0, closestT, sdf, radiusPx); output.control = float4(claimCoverage, coverage, saturate(radiusPx / 32.0), 0.0); output.reservoirGuide = float4(claimCoverage, 0.0, coverage, 0.0); + output.overdraw = 1.0; output.depth = saturate(travel / max(farDistance, 0.0001)); return output; } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12SdfCommon.hlsli b/src/Aquarium.Engine/Render/Shaders/D3D12SdfCommon.hlsli index 192618b..ffc5436 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12SdfCommon.hlsli +++ b/src/Aquarium.Engine/Render/Shaders/D3D12SdfCommon.hlsli @@ -77,6 +77,7 @@ struct SceneOut float4 metadata : SV_Target1; float4 control : SV_Target2; float4 reservoirGuide : SV_Target3; + float overdraw : SV_Target4; float depth : SV_Depth; }; diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12SdfProxy.hlsli b/src/Aquarium.Engine/Render/Shaders/D3D12SdfProxy.hlsli index a52c704..2015be6 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12SdfProxy.hlsli +++ b/src/Aquarium.Engine/Render/Shaders/D3D12SdfProxy.hlsli @@ -135,6 +135,7 @@ SceneOut D3D12SdfProxyPS(SdfObjectProxyVertexOut input) saturate(surface.temporalDetail), saturate(surface.reservoirConfidence)); output.reservoirGuide = float4(saturate(surface.reservoirConfidence), 0.0, 1.0, 0.0); + output.overdraw = 1.0; output.depth = saturate(travel / max(farDistance, 0.001)); return output; } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12TemporalGaussian.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12TemporalGaussian.hlsl index 2d42c7e..54b325a 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12TemporalGaussian.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12TemporalGaussian.hlsl @@ -52,6 +52,7 @@ struct SceneOut float4 metadata : SV_Target1; float4 control : SV_Target2; float4 reservoirGuide : SV_Target3; + float overdraw : SV_Target4; float depth : SV_Depth; }; @@ -185,6 +186,7 @@ SceneOut D3D12TemporalGaussianPS(TemporalGaussianVertexOut input) output.metadata = float4(FIELD_ID_TEMPORAL_GAUSSIAN_BASE + gaussian.previousCenterFieldId.w, normal); output.control = float4(opacity, saturate(gaussian.centerHistoryWeight.w), saturate(gaussian.shapePad.x / 8.0), 0.0); output.reservoirGuide = float4(saturate(gaussian.velocityConfidence.w), 0.0, 1.0, 0.0); + output.overdraw = 1.0; output.depth = saturate(travel / max(farDistance, 0.001)); return output; } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl index 7807e11..f6705c2 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl @@ -369,6 +369,7 @@ struct SceneOut float4 metadata : SV_Target1; float4 control : SV_Target2; float4 reservoirGuide : SV_Target3; + float overdraw : SV_Target4; float depth : SV_Depth; }; @@ -877,6 +878,7 @@ SceneOut D3D12TubeFieldPS(TubeFieldVertexOut input) output.metadata = float4(candidateFieldId, tubeNormal); output.control = float4(claimCoverage, supportCoverage, saturate(radiusWorld / max(viewRadius, 0.0001)), value); output.reservoirGuide = float4(claimCoverage, 0.0, supportCoverage, value); + output.overdraw = 1.0; output.depth = saturate(travel / max(farDistance, 0.0001)); float target = fieldReservoirDefaultTarget(output.colorTravel, output.control, output.reservoirGuide); float selectedColumn = round(input.tubeData.x); diff --git a/state/evidence.jsonl b/state/evidence.jsonl index 8f5d234..d968d26 100644 --- a/state/evidence.jsonl +++ b/state/evidence.jsonl @@ -331,3 +331,4 @@ {"ts":"2026-06-01T15:05:00+01:00","type":"implementation","status":"ok","note":"Eve remains the portable dashboard authority; the C# Aquarium/CultUI UI contract is the reference API shape. Added content padding and fixed-extent layout fields to retained surface documents, made pane headers conditional, and kept DirectWrite drawing plus D3D12 preview hit-testing on the same document geometry. Mimir now uses this for an edge-to-edge headerless editor shell with fixed output controls and an expanding inspector.","files":["src/Aquarium.Engine.Contracts/Ui/AquariumUi.cs","src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/DirectWriteOverlay.cs"],"source":"dotnet build src/Aquarium.Engine/Aquarium.Engine.csproj -p:UseSharedCompilation=false; dotnet build E:/Projects/Mimir/src/Mimir.App/Mimir.App.csproj -p:UseSharedCompilation=false; Mimir headless capture artifacts/runtime/mimir-output-panel-headless.png"} {"ts":"2026-06-01T15:40:00+01:00","type":"implementation","status":"ok","note":"AquariumUiElement now carries an optional typed AquariumUiBinding descriptor for Verse-backed CultCache/CultMesh fields: document schema/id, field path, value kind, access, authority, and optional command id. Fensalir lowerings keep using local callbacks for native actuation; the binding is provenance/state authority metadata, not renderer-owned dashboard semantics.","files":["src/Aquarium.Engine.Contracts/Ui/AquariumUi.cs","state/map.yaml"]} {"ts":"2026-06-01T15:48:00+01:00","type":"verification","status":"ok","note":"Release build passed for Aquarium.Engine after adding AquariumUiBinding; Mimir Release builds and scene-editor smoke also passed against the updated contract.","files":["src/Aquarium.Engine.Contracts/Ui/AquariumUi.cs"],"source":"dotnet build src/Aquarium.Engine/Aquarium.Engine.csproj -c Release -p:UseSharedCompilation=false; dotnet run --project E:/Projects/Mimir/src/Mimir.BufferSmoke/Mimir.BufferSmoke.csproj -c Release -- --scene-editor-smoke"} +{"ts":"2026-06-01T20:15:00+01:00","type":"implementation","status":"ok","note":"Render debug mode 21 is now an owner-layer overdraw view. Scene/evidence pixel shaders write a fifth additive R16_FLOAT overdraw target after discard/depth eligibility; presentation samples that target as a heat map. Coverage, step count, reservoir stats, and spatial-budget modes remain separate diagnostics instead of being relabeled as overdraw.","files":["src/Aquarium.Engine.Contracts/GraphicsSettings.cs","src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12SdfCommon.hlsli","src/Aquarium.Engine/Render/Shaders/D3D12SdfProxy.hlsli","src/Aquarium.Engine/Render/Shaders/D3D12TemporalGaussian.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12FractalSplatRender.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12PointCloud.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl"],"source":"dotnet build Fensalir.sln; AQUARIUM_RENDER_DEBUG_MODE=21 .\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -ClientProject src\\Aquarium.Fensalir\\Aquarium.Fensalir.csproj"}