diff --git a/src/Aquarium.Engine/Render/D3D12Renderer.cs b/src/Aquarium.Engine/Render/D3D12Renderer.cs index 375f875..8152d7c 100644 --- a/src/Aquarium.Engine/Render/D3D12Renderer.cs +++ b/src/Aquarium.Engine/Render/D3D12Renderer.cs @@ -30,13 +30,16 @@ public sealed class D3D12Renderer : IAquariumRenderer private const int FieldInstanceCount = PlanetCount + 5; private const int TransparentSurfaceCount = 1; private const int TransparentSurfaceBufferElementCount = FroxelBufferElementCount; + private const int BloomLevelCount = 3; private const float SunRadius = 1.12f; private const float FroxelMinZ = -2.0f; private const float FroxelMaxZ = 6.0f; + private const Format SceneHdrFormat = Format.R16G16B16A16_Float; private const string GridShaderRelativePath = "Render/Shaders/D3D12Grid.hlsl"; private const string SmokeShaderRelativePath = "Render/Shaders/D3D12Smoke.hlsl"; private const string MediumShaderRelativePath = "Render/Shaders/D3D12Medium.hlsl"; private const string SceneShaderRelativePath = "Render/Shaders/D3D12Scene.hlsl"; + private const string PostShaderRelativePath = "Render/Shaders/D3D12Post.hlsl"; private readonly IDXGIFactory4 factory; private readonly ID3D12Device device; @@ -51,17 +54,21 @@ public sealed class D3D12Renderer : IAquariumRenderer private readonly ID3D12PipelineState gridHeightBasePipelineState; private readonly ID3D12PipelineState gridHeightBrushPipelineState; private readonly ID3D12PipelineState scenePipelineState; - private readonly ID3D12PipelineState smokePipelineState; private readonly ID3D12PipelineState mediumVolumePipelineState; - private readonly ID3D12PipelineState copyPipelineState; private readonly ID3D12PipelineState mediumDensityDebugPipelineState; + private readonly ID3D12PipelineState bloomPrefilterPipelineState; + private readonly ID3D12PipelineState bloomDownsamplePipelineState; + private readonly ID3D12PipelineState bloomBlurHorizontalPipelineState; + private readonly ID3D12PipelineState bloomBlurVerticalPipelineState; + private readonly ID3D12PipelineState presentPipelineState; private readonly ID3D12Fence fence; private readonly AutoResetEvent fenceEvent = new(false); private D3D12RenderTarget gridHeightRenderTarget; private D3D12RenderTarget mediumVolumeRenderTarget; private D3D12RenderTarget mediumTransportRenderTarget; - private D3D12RenderTarget smokeRenderTarget; - private D3D12RenderTarget diagnosticUavTarget; + private D3D12RenderTarget sceneRenderTarget; + private readonly D3D12RenderTarget[] bloomRenderTargets = new D3D12RenderTarget[BloomLevelCount]; + private readonly D3D12RenderTarget[] bloomScratchTargets = new D3D12RenderTarget[BloomLevelCount]; private readonly D3D12StructuredBuffer froxelPrimitiveBuffer; private readonly D3D12StructuredBuffer fieldInstanceBuffer; private readonly D3D12StructuredBuffer transparentSurfaceIndexBuffer; @@ -136,8 +143,8 @@ public sealed class D3D12Renderer : IAquariumRenderer gridHeightRenderTarget = CreateGridHeightRenderTarget(); mediumVolumeRenderTarget = CreateMediumVolumeRenderTarget("medium-volume-target", "Aquarium D3D12 Medium Volume Target"); mediumTransportRenderTarget = CreateMediumVolumeRenderTarget("medium-transport-target", "Aquarium D3D12 Medium Transport Target"); - smokeRenderTarget = CreateSmokeRenderTarget(); - diagnosticUavTarget = CreateDiagnosticUavTarget(); + sceneRenderTarget = CreateSceneRenderTarget(); + CreateBloomRenderTargets(); froxelPrimitiveBuffer = new D3D12StructuredBuffer(device, FroxelBufferElementCount, Marshal.SizeOf(), "Aquarium D3D12 Froxel Primitive Buffer"); fieldInstanceBuffer = new D3D12StructuredBuffer(device, FieldInstanceCount, Marshal.SizeOf(), "Aquarium D3D12 Field Instance Buffer"); transparentSurfaceIndexBuffer = new D3D12StructuredBuffer(device, TransparentSurfaceBufferElementCount, Marshal.SizeOf(), "Aquarium D3D12 Transparent Surface Index Buffer"); @@ -149,13 +156,14 @@ public sealed class D3D12Renderer : IAquariumRenderer commandList = device.CreateCommandList(0, CommandListType.Direct, frames[frameIndex].CommandAllocator, null); commandList.Name = "Aquarium D3D12 Graphics Command List"; commandList.Close(); - ReportStartupProgress(startupProgress, "Creating D3D12 fullscreen smoke pipeline"); + ReportStartupProgress(startupProgress, "Creating D3D12 render pipelines"); fullscreenRootSignature = CreateFullscreenRootSignature(); fullscreenRootSignature.Name = "Aquarium D3D12 Fullscreen Root Signature"; var gridShaderPath = Path.Combine(AppContext.BaseDirectory, GridShaderRelativePath); var smokeShaderPath = Path.Combine(AppContext.BaseDirectory, SmokeShaderRelativePath); var mediumShaderPath = Path.Combine(AppContext.BaseDirectory, MediumShaderRelativePath); var sceneShaderPath = Path.Combine(AppContext.BaseDirectory, SceneShaderRelativePath); + var postShaderPath = Path.Combine(AppContext.BaseDirectory, PostShaderRelativePath); gridHeightBasePipelineState = CreateGridHeightBasePipelineState(gridShaderPath); gridHeightBasePipelineState.Name = "Aquarium D3D12 Grid Height Base Pipeline"; gridHeightBrushPipelineState = CreateGridHeightBrushPipelineState(gridShaderPath); @@ -164,12 +172,18 @@ public sealed class D3D12Renderer : IAquariumRenderer scenePipelineState.Name = "Aquarium D3D12 Scene Pipeline"; mediumVolumePipelineState = CreateMediumVolumePipelineState(mediumShaderPath); mediumVolumePipelineState.Name = "Aquarium D3D12 Medium Volume Pipeline"; - smokePipelineState = CreateSmokePipelineState(smokeShaderPath); - smokePipelineState.Name = "Aquarium D3D12 Smoke Pipeline"; - copyPipelineState = CreateCopyPipelineState(smokeShaderPath); - copyPipelineState.Name = "Aquarium D3D12 Copy Pipeline"; mediumDensityDebugPipelineState = CreateMediumDensityDebugPipelineState(smokeShaderPath); mediumDensityDebugPipelineState.Name = "Aquarium D3D12 Medium Density Debug Pipeline"; + bloomPrefilterPipelineState = CreateBloomPrefilterPipelineState(postShaderPath); + bloomPrefilterPipelineState.Name = "Aquarium D3D12 Bloom Prefilter Pipeline"; + bloomDownsamplePipelineState = CreateBloomDownsamplePipelineState(postShaderPath); + bloomDownsamplePipelineState.Name = "Aquarium D3D12 Bloom Downsample Pipeline"; + bloomBlurHorizontalPipelineState = CreateBloomBlurHorizontalPipelineState(postShaderPath); + bloomBlurHorizontalPipelineState.Name = "Aquarium D3D12 Bloom Blur Horizontal Pipeline"; + bloomBlurVerticalPipelineState = CreateBloomBlurVerticalPipelineState(postShaderPath); + bloomBlurVerticalPipelineState.Name = "Aquarium D3D12 Bloom Blur Vertical Pipeline"; + presentPipelineState = CreatePresentPipelineState(postShaderPath); + presentPipelineState.Name = "Aquarium D3D12 Present Pipeline"; viewport = new Viewport(0.0f, 0.0f, width, height); scissorRect = new RawRect(0, 0, width, height); fence = device.CreateFence(0); @@ -262,19 +276,6 @@ public sealed class D3D12Renderer : IAquariumRenderer new ConstantBufferViewDescription(gridBrushConstants.GpuVirtualAddress, gridBrushConstants.SizeInBytes), frameResources.GridBrushConstantsDescriptor.Cpu); - var smokeConstants = frameResources.UploadRing.WriteConstant(new SmokeConstants( - new Vector4( - 0.020f + settings.SceneExposure * 0.08f, - 0.048f + settings.BloomIntensity * 0.55f, - 0.066f + settings.BloomVeilIntensity * 1.2f, - 1.0f), - new Vector4(frame.TimeSeconds, RenderDebugMode, DebugUiVisible ? 1.0f : 0.0f, 0.0f))); - frameResources.SmokeConstantsDescriptor = frameResources.TransientShaderDescriptors.Allocate(); - device.CreateConstantBufferView( - new ConstantBufferViewDescription(smokeConstants.GpuVirtualAddress, smokeConstants.SizeInBytes), - frameResources.SmokeConstantsDescriptor.Cpu); - frameResources.DiagnosticUavDescriptor = frameResources.TransientShaderDescriptors.Allocate(); - diagnosticUavTarget.CreateUnorderedAccessView(device, frameResources.DiagnosticUavDescriptor); frameResources.FroxelPrimitiveDescriptor = frameResources.TransientShaderDescriptors.Allocate(); froxelPrimitiveBuffer.CreateShaderResourceView(device, frameResources.FroxelPrimitiveDescriptor); frameResources.FieldInstanceDescriptor = frameResources.TransientShaderDescriptors.Allocate(); @@ -289,6 +290,24 @@ public sealed class D3D12Renderer : IAquariumRenderer transparentSurfaceIndexBuffer.CreateShaderResourceView(device, frameResources.TransparentSurfaceIndexDescriptor); frameResources.TransparentSurfaceDescriptor = frameResources.TransientShaderDescriptors.Allocate(); transparentSurfaceBuffer.CreateShaderResourceView(device, frameResources.TransparentSurfaceDescriptor); + frameResources.SceneDescriptor = frameResources.TransientShaderDescriptors.Allocate(); + sceneRenderTarget.CreateShaderResourceView(device, frameResources.SceneDescriptor); + for (var level = 0; level < BloomLevelCount; level++) + { + frameResources.BloomDescriptors[level] = frameResources.TransientShaderDescriptors.Allocate(); + bloomRenderTargets[level].CreateShaderResourceView(device, frameResources.BloomDescriptors[level]); + frameResources.BloomScratchDescriptors[level] = frameResources.TransientShaderDescriptors.Allocate(); + bloomScratchTargets[level].CreateShaderResourceView(device, frameResources.BloomScratchDescriptors[level]); + } + + frameResources.BloomPresentationDescriptor = frameResources.TransientShaderDescriptors.Allocate(); + bloomRenderTargets[0].CreateShaderResourceView(device, frameResources.BloomPresentationDescriptor); + for (var level = 1; level < BloomLevelCount; level++) + { + var descriptor = frameResources.TransientShaderDescriptors.Allocate(); + bloomRenderTargets[level].CreateShaderResourceView(device, descriptor); + } + frameResources.CommandAllocator.Reset(); commandList.Reset(frameResources.CommandAllocator, null); @@ -304,7 +323,7 @@ public sealed class D3D12Renderer : IAquariumRenderer ClearMediumVolume(commandList); } - ClearBackBuffer(new D3D12PassContext(commandList, frameResources.BackBuffer, frameResources.BackBufferRenderTargetView.Cpu), frame); + RenderSceneAndPresent(new D3D12PassContext(commandList, frameResources.BackBuffer, frameResources.BackBufferRenderTargetView.Cpu), frameResources); commandList.EndEvent(); commandList.Close(); @@ -326,9 +345,12 @@ public sealed class D3D12Renderer : IAquariumRenderer fenceEvent.Dispose(); fence.Dispose(); commandList.Dispose(); + presentPipelineState.Dispose(); + bloomBlurVerticalPipelineState.Dispose(); + bloomBlurHorizontalPipelineState.Dispose(); + bloomDownsamplePipelineState.Dispose(); + bloomPrefilterPipelineState.Dispose(); mediumDensityDebugPipelineState.Dispose(); - copyPipelineState.Dispose(); - smokePipelineState.Dispose(); mediumVolumePipelineState.Dispose(); scenePipelineState.Dispose(); gridHeightBrushPipelineState.Dispose(); @@ -338,8 +360,8 @@ public sealed class D3D12Renderer : IAquariumRenderer froxelPrimitiveBuffer.Dispose(); transparentSurfaceBuffer.Dispose(); transparentSurfaceIndexBuffer.Dispose(); - diagnosticUavTarget.Dispose(); - smokeRenderTarget.Dispose(); + DisposeBloomRenderTargets(); + sceneRenderTarget.Dispose(); mediumTransportRenderTarget.Dispose(); mediumVolumeRenderTarget.Dispose(); gridHeightRenderTarget.Dispose(); @@ -386,13 +408,13 @@ public sealed class D3D12Renderer : IAquariumRenderer } WaitForGpu(); - resourceRegistry.RemoveRenderTarget("diagnostic-uav-target"); - resourceRegistry.RemoveRenderTarget("smoke-target"); + RemoveBloomRenderTargets(); + resourceRegistry.RemoveRenderTarget("scene-hdr-target"); resourceRegistry.RemoveRenderTarget("medium-transport-target"); resourceRegistry.RemoveRenderTarget("medium-volume-target"); resourceRegistry.RemoveRenderTarget("grid-height-target"); - diagnosticUavTarget.Dispose(); - smokeRenderTarget.Dispose(); + DisposeBloomRenderTargets(); + sceneRenderTarget.Dispose(); mediumTransportRenderTarget.Dispose(); mediumVolumeRenderTarget.Dispose(); gridHeightRenderTarget.Dispose(); @@ -416,30 +438,76 @@ public sealed class D3D12Renderer : IAquariumRenderer gridHeightRenderTarget = CreateGridHeightRenderTarget(); mediumVolumeRenderTarget = CreateMediumVolumeRenderTarget("medium-volume-target", "Aquarium D3D12 Medium Volume Target"); mediumTransportRenderTarget = CreateMediumVolumeRenderTarget("medium-transport-target", "Aquarium D3D12 Medium Transport Target"); - smokeRenderTarget = CreateSmokeRenderTarget(); - diagnosticUavTarget = CreateDiagnosticUavTarget(); + sceneRenderTarget = CreateSceneRenderTarget(); + CreateBloomRenderTargets(); viewport = new Viewport(0.0f, 0.0f, width, height); scissorRect = new RawRect(0, 0, width, height); Console.WriteLine($"D3D12 resized: {width}x{height}; {resourceRegistry.Describe()}"); } - private D3D12RenderTarget CreateSmokeRenderTarget() + private D3D12RenderTarget CreateSceneRenderTarget() { var target = new D3D12RenderTarget( device, width, height, - Format.B8G8R8A8_UNorm, + SceneHdrFormat, renderTargetViewArena.Allocate(), staticShaderDescriptorArena.Allocate(), null, false, - new Color4(0.006f, 0.014f, 0.022f, 1.0f), - "Aquarium D3D12 Smoke Target"); - resourceRegistry.Add("smoke-target", target); + new Color4(0.0f, 0.0f, 0.0f, 1.0f), + "Aquarium D3D12 Scene HDR Target"); + resourceRegistry.Add("scene-hdr-target", target); return target; } + private void CreateBloomRenderTargets() + { + for (var level = 0; level < BloomLevelCount; level++) + { + bloomRenderTargets[level] = CreateBloomRenderTarget(level, false); + bloomScratchTargets[level] = CreateBloomRenderTarget(level, true); + } + } + + private D3D12RenderTarget CreateBloomRenderTarget(int level, bool scratch) + { + var target = new D3D12RenderTarget( + device, + Math.Max(1, width >> (level + 1)), + Math.Max(1, height >> (level + 1)), + SceneHdrFormat, + renderTargetViewArena.Allocate(), + staticShaderDescriptorArena.Allocate(), + null, + false, + new Color4(0.0f, 0.0f, 0.0f, 1.0f), + scratch + ? $"Aquarium D3D12 Bloom Scratch L{level}" + : $"Aquarium D3D12 Bloom L{level}"); + resourceRegistry.Add(scratch ? $"bloom-scratch-{level}" : $"bloom-{level}", target); + return target; + } + + private void RemoveBloomRenderTargets() + { + for (var level = 0; level < BloomLevelCount; level++) + { + resourceRegistry.RemoveRenderTarget($"bloom-{level}"); + resourceRegistry.RemoveRenderTarget($"bloom-scratch-{level}"); + } + } + + private void DisposeBloomRenderTargets() + { + for (var level = 0; level < BloomLevelCount; level++) + { + bloomRenderTargets[level]?.Dispose(); + bloomScratchTargets[level]?.Dispose(); + } + } + private D3D12RenderTarget CreateGridHeightRenderTarget() { var target = new D3D12RenderTarget( @@ -474,51 +542,27 @@ public sealed class D3D12Renderer : IAquariumRenderer return target; } - private D3D12RenderTarget CreateDiagnosticUavTarget() + private void RenderSceneAndPresent(D3D12PassContext context, FrameResources frameResources) { - var target = new D3D12RenderTarget( - device, - width, - height, - Format.R8G8B8A8_UNorm, - renderTargetViewArena.Allocate(), - null, - null, - true, - new Color4(0.0f, 0.0f, 0.0f, 1.0f), - "Aquarium D3D12 Diagnostic UAV Target"); - resourceRegistry.Add("diagnostic-uav-target", target); - return target; - } - - private void ClearBackBuffer(D3D12PassContext context, AquariumFrame frame) - { - _ = frame; - var clearColor = new Color4( - 0.006f + settings.SceneExposure * 0.02f, - 0.014f + settings.BloomIntensity * 0.2f, - 0.022f + settings.BloomVeilIntensity * 0.8f, - 1.0f); - context.CommandList.BeginEvent("Scene Pass"); try { gridHeightRenderTarget.Transition(context.CommandList, ResourceStates.PixelShaderResource); mediumVolumeRenderTarget.Transition(context.CommandList, ResourceStates.PixelShaderResource); mediumTransportRenderTarget.Transition(context.CommandList, ResourceStates.PixelShaderResource); - smokeRenderTarget.Transition(context.CommandList, ResourceStates.RenderTarget); - context.CommandList.ClearRenderTargetView(smokeRenderTarget.RenderTargetView.Cpu, clearColor); - context.CommandList.SetDescriptorHeaps(frames[frameIndex].TransientShaderDescriptors.Heap); + sceneRenderTarget.Transition(context.CommandList, ResourceStates.RenderTarget); + context.CommandList.ClearRenderTargetView(sceneRenderTarget.RenderTargetView.Cpu, new Color4(0.0f, 0.0f, 0.0f, 1.0f)); + context.CommandList.SetDescriptorHeaps(frameResources.TransientShaderDescriptors.Heap); context.CommandList.SetPipelineState(scenePipelineState); context.CommandList.SetGraphicsRootSignature(fullscreenRootSignature); - context.CommandList.SetGraphicsRootDescriptorTable(0, frames[frameIndex].FrameConstantsDescriptor.Gpu); - context.CommandList.SetGraphicsRootDescriptorTable(1, frames[frameIndex].GridHeightDescriptor.Gpu); - context.CommandList.SetGraphicsRootDescriptorTable(4, frames[frameIndex].FroxelPrimitiveDescriptor.Gpu); - context.CommandList.SetGraphicsRootDescriptorTable(5, frames[frameIndex].FieldInstanceDescriptor.Gpu); - context.CommandList.SetGraphicsRootDescriptorTable(6, frames[frameIndex].MediumTargetsDescriptor.Gpu); + context.CommandList.SetGraphicsRootDescriptorTable(0, frameResources.FrameConstantsDescriptor.Gpu); + context.CommandList.SetGraphicsRootDescriptorTable(1, frameResources.GridHeightDescriptor.Gpu); + context.CommandList.SetGraphicsRootDescriptorTable(3, frameResources.FroxelPrimitiveDescriptor.Gpu); + context.CommandList.SetGraphicsRootDescriptorTable(4, frameResources.FieldInstanceDescriptor.Gpu); + context.CommandList.SetGraphicsRootDescriptorTable(5, frameResources.MediumTargetsDescriptor.Gpu); context.CommandList.RSSetViewports(viewport); context.CommandList.RSSetScissorRects(scissorRect); - context.CommandList.OMSetRenderTargets(smokeRenderTarget.RenderTargetView.Cpu, null); + context.CommandList.OMSetRenderTargets(sceneRenderTarget.RenderTargetView.Cpu, null); context.CommandList.IASetPrimitiveTopology(PrimitiveTopology.TriangleList); context.CommandList.DrawInstanced(3, 1, 0, 0); } @@ -527,21 +571,98 @@ public sealed class D3D12Renderer : IAquariumRenderer context.CommandList.EndEvent(); } - context.CommandList.BeginEvent("Copy Smoke Target To Swapchain"); + RenderBloom(context.CommandList, frameResources); + PresentBackBuffer(context, frameResources); + } + + private void RenderBloom(ID3D12GraphicsCommandList activeCommandList, FrameResources frameResources) + { + activeCommandList.BeginEvent("Bloom Pyramid"); + try + { + activeCommandList.SetDescriptorHeaps(frameResources.TransientShaderDescriptors.Heap); + activeCommandList.SetGraphicsRootSignature(fullscreenRootSignature); + activeCommandList.SetGraphicsRootDescriptorTable(0, frameResources.FrameConstantsDescriptor.Gpu); + sceneRenderTarget.Transition(activeCommandList, ResourceStates.PixelShaderResource); + + for (var level = 0; level < BloomLevelCount; level++) + { + var sourceDescriptor = level == 0 + ? frameResources.SceneDescriptor + : frameResources.BloomDescriptors[level - 1]; + var pipelineState = level == 0 + ? bloomPrefilterPipelineState + : bloomDownsamplePipelineState; + + DrawPostToTarget( + activeCommandList, + bloomRenderTargets[level], + sourceDescriptor, + pipelineState); + bloomRenderTargets[level].Transition(activeCommandList, ResourceStates.PixelShaderResource); + + DrawPostToTarget( + activeCommandList, + bloomScratchTargets[level], + frameResources.BloomDescriptors[level], + bloomBlurHorizontalPipelineState); + bloomScratchTargets[level].Transition(activeCommandList, ResourceStates.PixelShaderResource); + + DrawPostToTarget( + activeCommandList, + bloomRenderTargets[level], + frameResources.BloomScratchDescriptors[level], + bloomBlurVerticalPipelineState); + bloomRenderTargets[level].Transition(activeCommandList, ResourceStates.PixelShaderResource); + } + } + finally + { + activeCommandList.EndEvent(); + } + } + + private void DrawPostToTarget( + ID3D12GraphicsCommandList activeCommandList, + D3D12RenderTarget target, + D3D12DescriptorSlot sourceDescriptor, + ID3D12PipelineState pipelineState) + { + var targetViewport = new Viewport(0.0f, 0.0f, target.Width, target.Height); + var targetScissorRect = new RawRect(0, 0, target.Width, target.Height); + target.Transition(activeCommandList, ResourceStates.RenderTarget); + activeCommandList.ClearRenderTargetView(target.RenderTargetView.Cpu, new Color4(0.0f, 0.0f, 0.0f, 1.0f)); + activeCommandList.SetPipelineState(pipelineState); + activeCommandList.SetGraphicsRootDescriptorTable(1, sourceDescriptor.Gpu); + activeCommandList.RSSetViewports(targetViewport); + activeCommandList.RSSetScissorRects(targetScissorRect); + activeCommandList.OMSetRenderTargets(target.RenderTargetView.Cpu, null); + activeCommandList.IASetPrimitiveTopology(PrimitiveTopology.TriangleList); + activeCommandList.DrawInstanced(3, 1, 0, 0); + } + + private void PresentBackBuffer(D3D12PassContext context, FrameResources frameResources) + { + context.CommandList.BeginEvent("Present Pass"); try { var showMediumDensity = RenderDebugMode == 11; - var sourceTarget = showMediumDensity ? mediumVolumeRenderTarget : smokeRenderTarget; - var sourceDescriptor = sourceTarget.ShaderResourceView - ?? throw new InvalidOperationException($"{sourceTarget.Resource.Name} was created without an SRV."); - var presentPipelineState = showMediumDensity ? mediumDensityDebugPipelineState : copyPipelineState; - smokeRenderTarget.Transition(context.CommandList, ResourceStates.PixelShaderResource); + var sourceTarget = showMediumDensity ? mediumVolumeRenderTarget : sceneRenderTarget; + var sourceDescriptor = showMediumDensity ? frameResources.MediumTargetsDescriptor : frameResources.SceneDescriptor; + var pipelineState = showMediumDensity ? mediumDensityDebugPipelineState : presentPipelineState; + sourceTarget.Transition(context.CommandList, ResourceStates.PixelShaderResource); context.BackBuffer.Transition(context.CommandList, ResourceStates.RenderTarget); - context.CommandList.SetDescriptorHeaps(staticShaderDescriptorArena.Heap); - context.CommandList.SetPipelineState(presentPipelineState); + context.CommandList.SetDescriptorHeaps(frameResources.TransientShaderDescriptors.Heap); + context.CommandList.SetPipelineState(pipelineState); context.CommandList.SetGraphicsRootSignature(fullscreenRootSignature); + context.CommandList.SetGraphicsRootDescriptorTable(0, frameResources.FrameConstantsDescriptor.Gpu); context.CommandList.SetGraphicsRootDescriptorTable(1, sourceDescriptor.Gpu); + if (!showMediumDensity) + { + context.CommandList.SetGraphicsRootDescriptorTable(7, frameResources.BloomPresentationDescriptor.Gpu); + } + context.CommandList.RSSetViewports(viewport); context.CommandList.RSSetScissorRects(scissorRect); context.CommandList.OMSetRenderTargets(context.RenderTargetView, null); @@ -591,7 +712,7 @@ public sealed class D3D12Renderer : IAquariumRenderer activeCommandList.IASetPrimitiveTopology(PrimitiveTopology.TriangleList); activeCommandList.DrawInstanced(3, 1, 0, 0); activeCommandList.SetPipelineState(gridHeightBrushPipelineState); - activeCommandList.SetGraphicsRootDescriptorTable(3, frameResources.GridBrushConstantsDescriptor.Gpu); + activeCommandList.SetGraphicsRootDescriptorTable(2, frameResources.GridBrushConstantsDescriptor.Gpu); activeCommandList.DrawInstanced(6, GridHeightBrushCount, 0, 0); } finally @@ -618,8 +739,8 @@ public sealed class D3D12Renderer : IAquariumRenderer activeCommandList.SetGraphicsRootSignature(fullscreenRootSignature); activeCommandList.SetGraphicsRootDescriptorTable(0, frameResources.FrameConstantsDescriptor.Gpu); activeCommandList.SetGraphicsRootDescriptorTable(1, frameResources.GridHeightDescriptor.Gpu); - activeCommandList.SetGraphicsRootDescriptorTable(5, frameResources.FieldInstanceDescriptor.Gpu); - activeCommandList.SetGraphicsRootDescriptorTable(7, frameResources.TransparentSurfaceIndexDescriptor.Gpu); + activeCommandList.SetGraphicsRootDescriptorTable(4, frameResources.FieldInstanceDescriptor.Gpu); + activeCommandList.SetGraphicsRootDescriptorTable(6, frameResources.TransparentSurfaceIndexDescriptor.Gpu); activeCommandList.RSSetViewports(mediumViewport); activeCommandList.RSSetScissorRects(mediumScissorRect); activeCommandList.OMSetRenderTargets( @@ -1018,12 +1139,6 @@ public sealed class D3D12Renderer : IAquariumRenderer 0, 0, D3D12.DescriptorRangeOffsetAppend); - var diagnosticUavRange = new DescriptorRange( - DescriptorRangeType.UnorderedAccessView, - 1, - 1, - 0, - D3D12.DescriptorRangeOffsetAppend); var gridBrushRange = new DescriptorRange( DescriptorRangeType.ConstantBufferView, 1, @@ -1054,16 +1169,22 @@ public sealed class D3D12Renderer : IAquariumRenderer 15, 0, D3D12.DescriptorRangeOffsetAppend); + var bloomRange = new DescriptorRange( + DescriptorRangeType.ShaderResourceView, + BloomLevelCount, + 9, + 0, + D3D12.DescriptorRangeOffsetAppend); var rootParameters = new[] { new RootParameter(new RootDescriptorTable([constantBufferRange]), ShaderVisibility.All), new RootParameter(new RootDescriptorTable([sourceTextureRange]), ShaderVisibility.Pixel), - new RootParameter(new RootDescriptorTable([diagnosticUavRange]), ShaderVisibility.Pixel), new RootParameter(new RootDescriptorTable([gridBrushRange]), ShaderVisibility.All), new RootParameter(new RootDescriptorTable([froxelPrimitiveRange]), ShaderVisibility.Pixel), new RootParameter(new RootDescriptorTable([fieldInstanceRange]), ShaderVisibility.Pixel), new RootParameter(new RootDescriptorTable([mediumTargetRange]), ShaderVisibility.Pixel), new RootParameter(new RootDescriptorTable([transparentSurfaceRange]), ShaderVisibility.Pixel), + new RootParameter(new RootDescriptorTable([bloomRange]), ShaderVisibility.Pixel), }; var staticSamplers = new[] { @@ -1091,14 +1212,9 @@ public sealed class D3D12Renderer : IAquariumRenderer return new FrameResources(commandAllocator, uploadRing, transientDescriptors); } - private ID3D12PipelineState CreateSmokePipelineState(string path) - { - return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12SmokePS", Format.B8G8R8A8_UNorm); - } - private ID3D12PipelineState CreateScenePipelineState(string path) { - return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12ScenePS", Format.B8G8R8A8_UNorm); + return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12ScenePS", SceneHdrFormat); } private ID3D12PipelineState CreateMediumVolumePipelineState(string path) @@ -1110,16 +1226,36 @@ public sealed class D3D12Renderer : IAquariumRenderer [MediumVolumeFormat, MediumVolumeFormat]); } - private ID3D12PipelineState CreateCopyPipelineState(string path) - { - return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12CopyPS", Format.B8G8R8A8_UNorm); - } - private ID3D12PipelineState CreateMediumDensityDebugPipelineState(string path) { return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12MediumDensityDebugPS", Format.B8G8R8A8_UNorm); } + private ID3D12PipelineState CreateBloomPrefilterPipelineState(string path) + { + return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12BloomPrefilterPS", SceneHdrFormat); + } + + private ID3D12PipelineState CreateBloomDownsamplePipelineState(string path) + { + return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12BloomDownsamplePS", SceneHdrFormat); + } + + private ID3D12PipelineState CreateBloomBlurHorizontalPipelineState(string path) + { + return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12BloomBlurHorizontalPS", SceneHdrFormat); + } + + private ID3D12PipelineState CreateBloomBlurVerticalPipelineState(string path) + { + return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12BloomBlurVerticalPS", SceneHdrFormat); + } + + private ID3D12PipelineState CreatePresentPipelineState(string path) + { + return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12PresentPS", Format.B8G8R8A8_UNorm); + } + private ID3D12PipelineState CreateGridHeightBasePipelineState(string path) { return CreateFullscreenPipelineState(path, "FullscreenTriangleVS", "D3D12GridHeightBasePS", GridHeightFormat); @@ -1227,9 +1363,6 @@ public sealed class D3D12Renderer : IAquariumRenderer D3D12TrackedResource BackBuffer, CpuDescriptorHandle RenderTargetView); - [StructLayout(LayoutKind.Sequential)] - private readonly record struct SmokeConstants(Vector4 Tint, Vector4 Params); - [StructLayout(LayoutKind.Sequential)] private readonly record struct FrameConstants( Vector2 Resolution, @@ -1400,10 +1533,6 @@ public sealed class D3D12Renderer : IAquariumRenderer public D3D12DescriptorSlot GridBrushConstantsDescriptor { get; set; } - public D3D12DescriptorSlot SmokeConstantsDescriptor { get; set; } - - public D3D12DescriptorSlot DiagnosticUavDescriptor { get; set; } - public D3D12DescriptorSlot FroxelPrimitiveDescriptor { get; set; } public D3D12DescriptorSlot FieldInstanceDescriptor { get; set; } @@ -1418,6 +1547,14 @@ public sealed class D3D12Renderer : IAquariumRenderer public D3D12DescriptorSlot TransparentSurfaceDescriptor { get; set; } + public D3D12DescriptorSlot SceneDescriptor { get; set; } + + public D3D12DescriptorSlot[] BloomDescriptors { get; } = new D3D12DescriptorSlot[BloomLevelCount]; + + public D3D12DescriptorSlot[] BloomScratchDescriptors { get; } = new D3D12DescriptorSlot[BloomLevelCount]; + + public D3D12DescriptorSlot BloomPresentationDescriptor { get; set; } + public D3D12TrackedResource BackBuffer { get; set; } = null!; public D3D12DescriptorSlot BackBufferRenderTargetView { get; set; } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl new file mode 100644 index 0000000..470b406 --- /dev/null +++ b/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl @@ -0,0 +1,141 @@ +cbuffer AquariumFrame : register(b0) +{ + float2 resolution; + float timeSeconds; + float gridRadius; + float3 cameraPosition; + float farDistance; + float2 gridCenter; + float frameIndex; + float previousTimeSeconds; + float3 previousCameraPosition; + float previousGridRadius; + float2 previousGridCenter; + float2 jitterPixels; + float2 previousJitterPixels; + float renderDebugMode; + float exposure; + float bloomIntensity; + float bloomVeilIntensity; + float mediumCompositeIntensity; + float mediumDebugStep; + float3 presentationPadding; +}; + +Texture2D sourceTexture : register(t0); +Texture2D bloomTexture0 : register(t9); +Texture2D bloomTexture1 : register(t10); +Texture2D bloomTexture2 : register(t11); +SamplerState sourceSampler : register(s0); + +struct VertexOut +{ + float4 position : SV_Position; + float2 uv : TEXCOORD0; +}; + +VertexOut FullscreenTriangleVS(uint vertexId : SV_VertexID) +{ + float2 uv = float2((vertexId << 1) & 2, vertexId & 2); + VertexOut output; + output.position = float4(uv * float2(2.0, -2.0) + float2(-1.0, 1.0), 0.0, 1.0); + output.uv = uv; + return output; +} + +float luminance(float3 color) +{ + return dot(color, float3(0.2126, 0.7152, 0.0722)); +} + +float3 aces(float3 color) +{ + const float a = 2.51; + const float b = 0.03; + const float c = 2.43; + const float d = 0.59; + const float e = 0.14; + return saturate((color * (a * color + b)) / (color * (c * color + d) + e)); +} + +float4 D3D12BloomPrefilterPS(VertexOut input) : SV_Target0 +{ + return float4(sourceTexture.SampleLevel(sourceSampler, input.uv, 0.0).rgb * max(exposure, 0.001), 1.0); +} + +float4 D3D12BloomDownsamplePS(VertexOut input) : SV_Target0 +{ + float3 sumColor = 0.0; + float sumWeight = 0.0; + uint sourceWidth; + uint sourceHeight; + sourceTexture.GetDimensions(sourceWidth, sourceHeight); + float2 texel = 1.0 / float2(max(sourceWidth, 1), max(sourceHeight, 1)); + + [unroll] + for (int y = -1; y <= 1; y++) + { + [unroll] + for (int x = -1; x <= 1; x++) + { + float3 sampleColor = sourceTexture.SampleLevel(sourceSampler, input.uv + float2(x, y) * texel, 0.0).rgb; + float weight = rcp(1.0 + luminance(sampleColor) * 0.12); + sumColor += sampleColor * weight; + sumWeight += weight; + } + } + + return float4(sumColor / max(sumWeight, 0.0001), 1.0); +} + +float4 D3D12BloomBlurHorizontalPS(VertexOut input) : SV_Target0 +{ + uint sourceWidth; + uint sourceHeight; + sourceTexture.GetDimensions(sourceWidth, sourceHeight); + float2 texel = float2(1.0 / max(sourceWidth, 1), 0.0); + float3 color = + sourceTexture.SampleLevel(sourceSampler, input.uv - texel * 2.0, 0.0).rgb * 0.06136 + + sourceTexture.SampleLevel(sourceSampler, input.uv - texel, 0.0).rgb * 0.24477 + + sourceTexture.SampleLevel(sourceSampler, input.uv, 0.0).rgb * 0.38774 + + sourceTexture.SampleLevel(sourceSampler, input.uv + texel, 0.0).rgb * 0.24477 + + sourceTexture.SampleLevel(sourceSampler, input.uv + texel * 2.0, 0.0).rgb * 0.06136; + return float4(color, 1.0); +} + +float4 D3D12BloomBlurVerticalPS(VertexOut input) : SV_Target0 +{ + uint sourceWidth; + uint sourceHeight; + sourceTexture.GetDimensions(sourceWidth, sourceHeight); + float2 texel = float2(0.0, 1.0 / max(sourceHeight, 1)); + float3 color = + sourceTexture.SampleLevel(sourceSampler, input.uv - texel * 2.0, 0.0).rgb * 0.06136 + + sourceTexture.SampleLevel(sourceSampler, input.uv - texel, 0.0).rgb * 0.24477 + + sourceTexture.SampleLevel(sourceSampler, input.uv, 0.0).rgb * 0.38774 + + sourceTexture.SampleLevel(sourceSampler, input.uv + texel, 0.0).rgb * 0.24477 + + sourceTexture.SampleLevel(sourceSampler, input.uv + texel * 2.0, 0.0).rgb * 0.06136; + return float4(color, 1.0); +} + +float4 D3D12PresentPS(VertexOut input) : SV_Target0 +{ + float3 scene = sourceTexture.SampleLevel(sourceSampler, input.uv, 0.0).rgb * max(exposure, 0.001); + float3 bloom = + bloomTexture0.SampleLevel(sourceSampler, input.uv, 0.0).rgb * 0.42 + + bloomTexture1.SampleLevel(sourceSampler, input.uv, 0.0).rgb * 0.34 + + bloomTexture2.SampleLevel(sourceSampler, input.uv, 0.0).rgb * 0.24; + if (renderDebugMode >= 6.5 && renderDebugMode < 7.5) + { + return float4(aces(bloom * bloomIntensity), 1.0); + } + + if (renderDebugMode >= 7.5 && renderDebugMode < 8.5) + { + float luma = luminance(scene); + return float4(luma.xxx, 1.0); + } + + float3 presented = scene + bloom * bloomIntensity + luminance(bloom) * bloomVeilIntensity; + return float4(aces(presented), 1.0); +} diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl index d2668eb..bf0df83 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl @@ -192,16 +192,6 @@ void integrateMedium(float2 uv, float maxTravel, out float densityMean, out floa densityMean = saturate(densityMean / (float)MEDIUM_FROXEL_SLICE_COUNT); } -float3 aces(float3 color) -{ - const float a = 2.51; - const float b = 0.03; - const float c = 2.43; - const float d = 0.59; - const float e = 0.14; - return saturate((color * (a * color + b)) / (color * (c * color + d) + e)); -} - float3 shadeBody(float3 p, float3 normal, int primitiveId) { float3 self = float3(0.0, 0.0, 2.2); @@ -258,5 +248,5 @@ float4 D3D12ScenePS(VertexOut input) : SV_Target0 color = lerp(float3(0.006, 0.016, 0.026), float3(0.32, 0.86, 1.0), saturate(densityMean * 6.0)); } - return float4(aces(color * max(exposure, 0.001)), 1.0); + return float4(color, 1.0); } diff --git a/state/evidence.jsonl b/state/evidence.jsonl index 8584bbf..f032297 100644 --- a/state/evidence.jsonl +++ b/state/evidence.jsonl @@ -77,3 +77,4 @@ {"area":"renderer/d3d12","lesson":"D3D12 now renders the first medium froxel atlas pass into diagnostic and transport render targets from the field instance structured buffer. Render debug mode 11 displays D3D12 froxel density, and the old D3D12 Grid-height debug PSO was removed instead of preserving stale bring-up scaffolding.","files":["src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12Medium.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12Smoke.hlsl","docs/d3d12-migration.md","docs/d3d12-best-practices-audit.md","docs/hlsl-renderer.md","state/map.yaml","state/scratch.md"],"verification":["dotnet build src\\Aquarium.Engine\\Aquarium.Engine.csproj","dotnet build Aquarium.Engine.slnx",".\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -HeadlessTimeoutSeconds 20 with AQUARIUM_RENDERER=d3d12 and AQUARIUM_RENDER_DEBUG_MODE=11 exited 0",".\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -HeadlessTimeoutSeconds 20 with AQUARIUM_RENDERER=d3d12 and AQUARIUM_RENDER_DEBUG_MODE=0 exited 0"],"ts":"2026-05-09"} {"area":"renderer/d3d12","lesson":"D3D12 final mode now renders a first real scene pass instead of smoke: Self, planets, and medium transport are composed from D3D12 resources. Grid line transparency is injected into the medium froxel atlas as a thin participating layer and is not used as a scene-depth terminator; transparent surfaces should enter the same binned froxel/field integration path as volumetrics rather than alpha-blending as a separate class.","files":["src/Aquarium.Engine/Render/D3D12RenderTarget.cs","src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12Medium.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl","docs/d3d12-migration.md","docs/d3d12-best-practices-audit.md","docs/hlsl-renderer.md","state/map.yaml","state/memory.json","state/scratch.md"],"verification":["dotnet build src\\Aquarium.Engine\\Aquarium.Engine.csproj","dotnet build Aquarium.Engine.slnx",".\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -HeadlessTimeoutSeconds 20 with AQUARIUM_RENDERER=d3d12 and AQUARIUM_RENDER_DEBUG_MODE=0 exited 0",".\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -HeadlessTimeoutSeconds 20 with AQUARIUM_RENDERER=d3d12 and AQUARIUM_RENDER_DEBUG_MODE=11 exited 0"],"ts":"2026-05-09"} {"area":"renderer/d3d12","lesson":"Transparent Grid contribution is now routed through an explicit transparent-surface table and froxel-binned transparent surface id buffer. The medium pass resolves transparent surface density/scattering by looking up the current froxel, so Grid/particles/billboards can share the same integration class instead of becoming alpha-blended scene-depth exceptions. The Medium Composite knob gates registered cloud media, while binned transparent surfaces still contribute to transport.","files":["src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12Medium.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl","docs/d3d12-migration.md","docs/d3d12-best-practices-audit.md","docs/hlsl-renderer.md","state/map.yaml","state/memory.json","state/scratch.md"],"verification":["dotnet build src\\Aquarium.Engine\\Aquarium.Engine.csproj","dotnet build Aquarium.Engine.slnx",".\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -HeadlessTimeoutSeconds 20 with AQUARIUM_RENDERER=d3d12 and AQUARIUM_RENDER_DEBUG_MODE=0 exited 0",".\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -HeadlessTimeoutSeconds 20 with AQUARIUM_RENDERER=d3d12 and AQUARIUM_RENDER_DEBUG_MODE=11 exited 0"],"ts":"2026-05-09"} +{"area":"renderer/d3d12","lesson":"D3D12 presentation now mirrors the HDR doctrine: render scene-linear into an R16G16B16A16_Float scene target, build a three-level half/quarter/eighth bloom pyramid with firefly-safe downsample and separable blur scratch targets, then apply exposure, bloom/veil composite, and ACES only in the present pass. Debug mode 7 shows bloom contribution, mode 8 exposed luminance, and mode 11 remains a direct medium-density bypass.","files":["src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl","state/scratch.md"],"verification":["dotnet build src\\Aquarium.Engine\\Aquarium.Engine.csproj","dotnet build Aquarium.Engine.slnx",".\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -HeadlessTimeoutSeconds 20 with AQUARIUM_RENDERER=d3d12 and AQUARIUM_RENDER_DEBUG_MODE=0 exited 0",".\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -HeadlessTimeoutSeconds 20 with AQUARIUM_RENDERER=d3d12 and AQUARIUM_RENDER_DEBUG_MODE=7 exited 0",".\\scripts\\dev-reload.ps1 -Headless -RetainSlots 4 -HeadlessTimeoutSeconds 20 with AQUARIUM_RENDERER=d3d12 and AQUARIUM_RENDER_DEBUG_MODE=11 exited 0"],"ts":"2026-05-09"} diff --git a/state/scratch.md b/state/scratch.md index 8b712cf..e953bcd 100644 --- a/state/scratch.md +++ b/state/scratch.md @@ -299,3 +299,9 @@ can start porting real passes while keeping D3D11 as the visual reference. medium shader discovers the Grid layer through the froxel bin, not through a hardcoded alpha/composite side path. This is the first implementation of the particle/billboard transparency contract. +- D3D12 HDR presentation pass: final D3D12 scene output is now scene-linear + `R16G16B16A16_Float`. A three-level half/quarter/eighth bloom pyramid uses + firefly-safe downsample plus separable horizontal/vertical blur before final + exposure, bloom/veil composite, and ACES presentation. Debug mode 7 shows + bloom contribution; mode 8 shows exposed luminance; mode 11 still bypasses + post to inspect the medium density atlas.