Skip to content

Porting most of post processing to Render graph #1038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 4, 2020
Merged

Porting most of post processing to Render graph #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
551dd14
StopNaNs and guardbands to rendergraph
FrancescoC-unity Jun 18, 2020
0d7fff8
Make fixed exposure rendergraph ready
FrancescoC-unity Jun 18, 2020
6e80082
More steps toward final conversion
FrancescoC-unity Jun 29, 2020
360d95b
Merge branch 'HDRP/staging' into HDRP/port-pp-to-rendergraph
FrancescoC-unity Jun 29, 2020
4da67e4
Port most of remaining passes to RG
FrancescoC-unity Jun 29, 2020
2ca49b5
Port CAS to Rendergraph ready stage.
FrancescoC-unity Jun 29, 2020
60a54c9
Enable more tests
FrancescoC-unity Jun 29, 2020
7a5d7fe
Explicit motion vector texture
FrancescoC-unity Jun 29, 2020
0a19d6c
Merge branch 'HDRP/staging' into HDRP/port-pp-to-rendergraph
FrancescoC-unity Jul 3, 2020
9732568
PR addressing (part 1)
FrancescoC-unity Jul 3, 2020
c8417e8
Rest of stuff from PR
FrancescoC-unity Jul 3, 2020
836929d
CAS + scene exposure fix
FrancescoC-unity Jul 3, 2020
9d9315f
Fixed an issue when PP is off
FrancescoC-unity Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...s/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ PrefabInstance:
- target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7,
type: 3}
propertyPath: renderGraphCompatible
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3}
Expand Down Expand Up @@ -930,6 +930,7 @@ MonoBehaviour:
m_EnableSpotReflector: 0
m_LuxAtDistance: 1
m_InnerSpotPercent: 0
m_SpotIESCutoffPercent: 100
m_LightDimmer: 1
m_VolumetricDimmer: 1
m_LightUnit: 2
Expand All @@ -948,6 +949,8 @@ MonoBehaviour:
m_ApplyRangeAttenuation: 1
m_DisplayAreaLightEmissiveMesh: 0
m_AreaLightCookie: {fileID: 0}
m_IESPoint: {fileID: 0}
m_IESSpot: {fileID: 0}
m_AreaLightShadowCone: 120
m_UseScreenSpaceShadows: 0
m_InteractsWithSky: 1
Expand Down
2 changes: 1 addition & 1 deletion ...jects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ PrefabInstance:
- target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7,
type: 3}
propertyPath: renderGraphCompatible
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3}
5 changes: 4 additions & 1 deletion TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3643,6 +3643,7 @@ MonoBehaviour:
m_EnableSpotReflector: 0
m_LuxAtDistance: 1
m_InnerSpotPercent: 0
m_SpotIESCutoffPercent: 100
m_LightDimmer: 1
m_VolumetricDimmer: 1
m_LightUnit: 2
Expand All @@ -3661,6 +3662,8 @@ MonoBehaviour:
m_ApplyRangeAttenuation: 1
m_DisplayAreaLightEmissiveMesh: 0
m_AreaLightCookie: {fileID: 0}
m_IESPoint: {fileID: 0}
m_IESSpot: {fileID: 0}
m_AreaLightShadowCone: 120
m_UseScreenSpaceShadows: 0
m_InteractsWithSky: 1
Expand Down Expand Up @@ -4111,7 +4114,7 @@ PrefabInstance:
- target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7,
type: 3}
propertyPath: renderGraphCompatible
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3}
Expand Down
8 changes: 8 additions & 0 deletions com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ internal ResourceHandle(int value, RenderGraphResourceType type)
[DebuggerDisplay("Texture ({handle})")]
public struct TextureHandle
{
private static TextureHandle s_NullHandle = new TextureHandle();

/// <summary>
/// Returns a null texture handle
/// </summary>
/// <returns>A null texture handle.</returns>
public static TextureHandle nullHandle { get { return s_NullHandle; } }

internal ResourceHandle handle;

internal TextureHandle(int handle) { this.handle = new ResourceHandle(handle, RenderGraphResourceType.Texture); }
Expand Down
734 changes: 514 additions & 220 deletions ....render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs
View file
Open in desktop

Large diffs are not rendered by default.

417 changes: 250 additions & 167 deletions com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDProfileId.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,12 @@ internal enum HDProfileId
UpsampleLowResTransparent,

// Post-processing
GuardBandClear,
AlphaCopy,
StopNaNs,
FixedExposure,
DynamicExposure,
ApplyExposure,
TemporalAntialiasing,
DepthOfField,
DepthOfFieldKernel,
Expand Down
8 changes: 5 additions & 3 deletions ...y.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class AfterPostProcessPassData
}

TextureHandle RenderPostProcess( RenderGraph renderGraph,
PrepassOutput prepassOutput,
TextureHandle inputColor,
TextureHandle depthBuffer,
TextureHandle backBuffer,
CullingResults cullResults,
HDCamera hdCamera)
Expand All @@ -36,7 +36,7 @@ TextureHandle RenderPostProcess( RenderGraph renderGraph,
passData.afterPostProcessBuffer = builder.UseColorBuffer(renderGraph.CreateTexture(
new TextureDesc(Vector2.one, true, true) { colorFormat = GraphicsFormat.R8G8B8A8_SRGB, clearBuffer = true, clearColor = Color.black, name = "OffScreen AfterPostProcess" }), 0);
if (passData.parameters.useDepthBuffer)
passData.depthStencilBuffer = builder.UseDepthBuffer(depthBuffer, DepthAccess.ReadWrite);
passData.depthStencilBuffer = builder.UseDepthBuffer(prepassOutput.depthBuffer, DepthAccess.ReadWrite);
passData.opaqueAfterPostprocessRL = builder.UseRendererList(renderGraph.CreateRendererList(passData.parameters.opaqueAfterPPDesc));
passData.transparentAfterPostprocessRL = builder.UseRendererList(renderGraph.CreateRendererList(passData.parameters.transparentAfterPPDesc));

Expand All @@ -60,7 +60,9 @@ TextureHandle RenderPostProcess( RenderGraph renderGraph,
parameters.blueNoise,
inputColor,
afterPostProcessBuffer,
depthBuffer,
prepassOutput.resolvedDepthBuffer,
prepassOutput.depthPyramidTexture,
prepassOutput.resolvedMotionVectorsBuffer,
dest,
parameters.flipYInPostProcess
);
Expand Down
2 changes: 1 addition & 1 deletion ...y.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest,

aovRequest.PushCameraTexture(m_RenderGraph, AOVBuffers.Color, hdCamera, colorBuffer, aovBuffers);

TextureHandle postProcessDest = RenderPostProcess(m_RenderGraph, colorBuffer, prepassOutput.resolvedDepthBuffer, backBuffer, cullingResults, hdCamera);
TextureHandle postProcessDest = RenderPostProcess(m_RenderGraph, prepassOutput, colorBuffer, backBuffer, cullingResults, hdCamera);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above, this will cause a regression.


// TODO RENDERGRAPH
//// If requested, compute histogram of the very final image
Expand Down
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5342,6 +5342,7 @@ void RenderPostProcess(CullingResults cullResults, HDCamera hdCamera, RenderTarg
finalRT: destination,
depthBuffer: m_SharedRTManager.GetDepthStencilBuffer(),
depthMipChain: m_SharedRTManager.GetDepthTexture(),
motionVecTexture: m_SharedRTManager.GetMotionVectorsBuffer(),
flipY: parameters.flipYInPostProcess
);
}
Expand Down