id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 06:34:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added missing TAA pixeloffset to SSAO pass

Browse source
This commit is contained in:
Robert Beckebans 2023-02-11 18:08:00 +01:00
parent 3e201f63be
commit a12db413fc
6 changed files with 12 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
neo/renderer/Passes/SsaoPass.cpp
View file

@ -41,6 +41,8 @@ struct SsaoConstants
{
idVec2 viewportOrigin;
idVec2 viewportSize;
idVec2 pixelOffset;
idVec2 unused;
idRenderMatrix matClipToView;
idRenderMatrix matWorldToView; // unused
@ -258,6 +260,7 @@ void SsaoPass::Render(
SsaoConstants ssaoConstants = {};
ssaoConstants.viewportOrigin = idVec2( viewDef->viewport.x1, viewDef->viewport.y1 );
ssaoConstants.viewportSize = idVec2( viewDef->viewport.GetWidth(), viewDef->viewport.GetHeight() );
ssaoConstants.pixelOffset = tr.backend.GetCurrentPixelOffset();
// RB: this actually should work but it only works with the old SSAO method ...
//ssaoConstants.matClipToView = viewDef->unprojectionToCameraRenderMatrix;

13
neo/renderer/Passes/SsaoPass.h
View file

@ -22,19 +22,6 @@
#ifndef RENDERER_PASSES_SSAOPASS_H_
#define RENDERER_PASSES_SSAOPASS_H_
/*
struct SsaoParameters
{
float amount = 2.f;
float backgroundViewDepth = 100.f;
float radiusWorld = 0.5f;
float surfaceBias = 0.1f;
float powerExponent = 2.f;
bool enableBlur = true;
float blurSharpness = 16.f;
};
*/
class SsaoPass
{
private:

68
neo/renderer/Passes/TemporalAntiAliasingPass.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2014-2021, NVIDIA CORPORATION. All rights reserved.
* Copyright (C) 2022 Robert Beckebans (id Tech 4x integration)
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -162,22 +163,6 @@ void TemporalAntiAliasingPass::Init(
bindingSetDesc.bindings.push_back( nvrhi::BindingSetItem::Texture_SRV( 1, params.sourceDepth, stencilFormat ) );
}
m_MotionVectorsBindingSet = device->createBindingSet( bindingSetDesc, m_MotionVectorsBindingLayout );
#if 0
nvrhi::GraphicsPipelineDesc pipelineDesc;
pipelineDesc.primType = nvrhi::PrimitiveType::TriangleStrip;
pipelineDesc.VS = taaMotionVectorsShaderInfo.vs; //m_CommonPasses->m_FullscreenVS;
pipelineDesc.PS = taaMotionVectorsShaderInfo.ps; //m_MotionVectorPS;
pipelineDesc.bindingLayouts = { m_MotionVectorsBindingLayout };
pipelineDesc.renderState.rasterState.setCullNone();
pipelineDesc.renderState.depthStencilState.depthTestEnable = false;
pipelineDesc.renderState.depthStencilState.stencilEnable = false;
//nvrhi::IFramebuffer* sampleFramebuffer = m_MotionVectorsFramebufferFactory->GetFramebuffer( *sampleView );
nvrhi::IFramebuffer* sampleFramebuffer = globalFramebuffers.taaMotionVectorsFBO->GetApiObject();
m_MotionVectorsPso = device->createGraphicsPipeline( pipelineDesc, sampleFramebuffer );
#endif
}
{
@ -208,55 +193,6 @@ void TemporalAntiAliasingPass::Init(
}
}
#if 0
void TemporalAntiAliasingPass::RenderMotionVectors(
nvrhi::ICommandList* commandList,
const ICompositeView& compositeView,
const ICompositeView& compositeViewPrevious,
dm::float3 preViewTranslationDifference )
{
assert( compositeView.GetNumChildViews( ViewType::PLANAR ) == compositeViewPrevious.GetNumChildViews( ViewType::PLANAR ) );
assert( m_MotionVectorsPso );
commandList->beginMarker( "MotionVectors" );
for( uint viewIndex = 0; viewIndex < compositeView.GetNumChildViews( ViewType::PLANAR ); viewIndex++ )
{
const IView* view = compositeView.GetChildView( ViewType::PLANAR, viewIndex );
const IView* viewPrevious = compositeViewPrevious.GetChildView( ViewType::PLANAR, viewIndex );
const nvrhi::ViewportState viewportState = view->GetViewportState();
// This pass only works for planar, single-viewport views
assert( viewportState.viewports.size() == 1 );
const nvrhi::Viewport& inputViewport = viewportState.viewports[0];
TemporalAntiAliasingConstants taaConstants = {};
affine3 viewReprojection = inverse( view->GetViewMatrix() ) * translation( -preViewTranslationDifference ) * viewPrevious->GetViewMatrix();
taaConstants.reprojectionMatrix = inverse( view->GetProjectionMatrix( false ) ) * affineToHomogeneous( viewReprojection ) * viewPrevious->GetProjectionMatrix( false );
taaConstants.inputViewOrigin = float2( inputViewport.minX, inputViewport.minY );
taaConstants.inputViewSize = float2( inputViewport.width(), inputViewport.height() );
taaConstants.stencilMask = m_StencilMask;
commandList->writeBuffer( m_TemporalAntiAliasingCB, &taaConstants, sizeof( taaConstants ) );
nvrhi::GraphicsState state;
state.pipeline = m_MotionVectorsPso;
state.framebuffer = m_MotionVectorsFramebufferFactory->GetFramebuffer( *view );
state.bindings = { m_MotionVectorsBindingSet};
state.viewport = viewportState;
commandList->setGraphicsState( state );
nvrhi::DrawArguments args;
args.instanceCount = 1;
args.vertexCount = 4;
commandList->draw( args );
}
commandList->endMarker();
}
#endif
void TemporalAntiAliasingPass::TemporalResolve(
nvrhi::ICommandList* commandList,
const TemporalAntiAliasingParameters& params,
@ -279,9 +215,7 @@ void TemporalAntiAliasingPass::TemporalResolve(
taaConstants.inputViewSize = idVec2( viewportInput.width() + 1, viewportInput.height() + 1 );
taaConstants.outputViewOrigin = idVec2( viewportOutput.minX, viewportOutput.minY );
taaConstants.outputViewSize = idVec2( viewportOutput.width() + 1, viewportOutput.height() + 1 );
//taaConstants.inputPixelOffset.Set( 0, 0 ); // TODO = viewInput->GetPixelOffset();
taaConstants.inputPixelOffset = GetCurrentPixelOffset();
// SRS - FIXME: Is this correct? Replaces 1.0f / idVec2 () which does not compile using Clang
taaConstants.outputTextureSizeInv = idVec2( 1.0f, 1.0f ) / idVec2( float( renderSystem->GetWidth() ), float( renderSystem->GetHeight() ) );
taaConstants.inputOverOutputViewSize = taaConstants.inputViewSize / taaConstants.outputViewSize;
taaConstants.outputOverInputViewSize = taaConstants.outputViewSize / taaConstants.inputViewSize;

2
neo/shaders/builtin/SSAO/ssao_blur.cs.hlsl
View file

@ -28,6 +28,8 @@ struct SsaoConstants
{
float2 viewportOrigin;
float2 viewportSize;
float2 pixelOffset;
float2 unused; // padding
float4x4 matClipToView;
float4x4 matWorldToView;

7
neo/shaders/builtin/SSAO/ssao_compute.cs.hlsl
View file

@ -28,6 +28,8 @@ struct SsaoConstants
{
float2 viewportOrigin;
float2 viewportSize;
float2 pixelOffset;
float2 unused; // padding
float4x4 matClipToView;
float4x4 matWorldToView;
@ -182,9 +184,8 @@ float2 WindowToClip( float2 windowPos )
float2 windowToClipScale = 1.0 / clipToWindowScale;
float2 windowToClipBias = -clipToWindowBias * windowToClipScale;
// TODO add pixelOffset for TAA
//windowPos = windowPos * 2.0 - 1.0;
return windowPos.xy * windowToClipScale + windowToClipBias;
//return windowPos.xy * windowToClipScale + windowToClipBias;
return ( windowPos.xy + g_Ssao.pixelOffset.xy ) * windowToClipScale + windowToClipBias;
}
float3 ViewDepthToViewPos( float2 clipPosXY, float viewDepth )

2
neo/shaders/builtin/SSAO/ssao_deinterleave.cs.hlsl
View file

@ -28,6 +28,8 @@ struct SsaoConstants
{
float2 viewportOrigin;
float2 viewportSize;
float2 pixelOffset;
float2 unused; // padding
float4x4 matClipToView;
float4x4 matWorldToView;