Skip to content

Fix XR depth copy and MSAA #3075

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 4 commits into from
Jan 13, 2021
Merged

Fix XR depth copy and MSAA #3075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bdbde1
fix for XR depth copy and MSAA
fabien-unity Jan 12, 2021
5b42418
fix some RenderGraph edge cases with XR
fabien-unity Jan 12, 2021
08e63e6
add entry to changelog
fabien-unity Jan 12, 2021
17820c9
Merge branch 'master' into HDRP/xr/fixes-for-rg
sebastienlagarde Jan 13, 2021
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
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Fixed
- Fixed GC allocations from XR occlusion mesh when using multipass.
- Fixed XR depth copy when using MSAA.

## [11.0.0] - 2020-10-21

Expand Down
11 changes: 9 additions & 2 deletions ...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 @@ -91,7 +91,14 @@ void ExecuteWithRenderGraph(RenderRequest renderRequest,
// lightCluster.EvaluateClusterDebugView(cmd, hdCamera);
//}

colorBuffer = RenderPathTracing(m_RenderGraph, hdCamera);
if (hdCamera.viewCount == 1)
{
colorBuffer = RenderPathTracing(m_RenderGraph, hdCamera);
}
else
{
Debug.LogWarning("Path Tracing is not supported with XR single-pass rendering.");
}
}
else
{
Expand Down Expand Up @@ -270,7 +277,7 @@ void ExecuteWithRenderGraph(RenderRequest renderRequest,

RenderCustomPass(m_RenderGraph, hdCamera, postProcessDest, prepassOutput, customPassCullingResults, cullingResults, CustomPassInjectionPoint.AfterPostProcess, aovRequest, aovCustomPassBuffers);

CopyXRDepth(m_RenderGraph, hdCamera, prepassOutput.depthBuffer, backBuffer);
CopyXRDepth(m_RenderGraph, hdCamera, prepassOutput.resolvedDepthBuffer, backBuffer);

// In developer build, we always render post process in an intermediate buffer at (0,0) in which we will then render debug.
// Because of this, we need another blit here to the final render target at the right viewport.
Expand Down
2 changes: 1 addition & 1 deletion ...der-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraphUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class RenderOcclusionMeshesPassData

void RenderXROcclusionMeshes(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle colorBuffer, TextureHandle depthBuffer)
{
if (hdCamera.xr.enabled && m_Asset.currentPlatformRenderPipelineSettings.xrSettings.occlusionMesh)
if (hdCamera.xr.hasValidOcclusionMesh && m_Asset.currentPlatformRenderPipelineSettings.xrSettings.occlusionMesh)
{
using (var builder = renderGraph.AddRenderPass<RenderOcclusionMeshesPassData>("XR Occlusion Meshes", out var passData))
{
Expand Down
6 changes: 0 additions & 6 deletions com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,12 +334,6 @@ TextureHandle RenderPathTracing(RenderGraph renderGraph, HDCamera hdCamera)
if (!pathTracingShader || !m_PathTracingSettings.enable.value)
return TextureHandle.nullHandle;

if (hdCamera.viewCount > 1)
{
Debug.LogError("Path Tracing is not supported when using XR single-pass rendering.");
return TextureHandle.nullHandle;
}

CheckDirtiness(hdCamera);

var parameters = PreparePathTracingParameters(hdCamera);
Expand Down