Skip to content

Remove MSAA debug mode when renderpipeline asset has no MSAA #1289

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 2 commits into from
Jul 16, 2020
Merged

Remove MSAA debug mode when renderpipeline asset has no MSAA #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3577b5b
Remove MSAA debug mode when renderpipeline asset has no MSAA
adrien-de-tocqueville Jul 15, 2020
d401974
Merge branch 'HDRP/staging' into HDRP/fix-msaa-debug
sebastienlagarde Jul 16, 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
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 @@ -734,6 +734,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed rendering breaking when disabling tonemapping in the frame settings.
- Fixed issue with serialization of exposure modes in volume profiles not being consistent between HDRP versions (case 1261385).
- Fixed issue with duplicate names in newly created sub-layers in the graphics compositor (case 1263093).
- Remove MSAA debug mode when renderpipeline asset has no MSAA

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
9 changes: 6 additions & 3 deletions com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,10 +1550,13 @@ void RegisterRenderingDebug()
});
}

widgetList.AddRange(new DebugUI.Widget[]
if (HDRenderPipeline.currentAsset?.currentPlatformRenderPipelineSettings.supportMSAA ?? true)
{
new DebugUI.EnumField { displayName = "MSAA Samples", getter = () => (int)data.msaaSamples, setter = value => data.msaaSamples = (MSAASamples)value, enumNames = s_MsaaSamplesDebugStrings, enumValues = s_MsaaSamplesDebugValues, getIndex = () => data.msaaSampleDebugModeEnumIndex, setIndex = value => data.msaaSampleDebugModeEnumIndex = value },
});
widgetList.AddRange(new DebugUI.Widget[]
{
new DebugUI.EnumField { displayName = "MSAA Samples", getter = () => (int)data.msaaSamples, setter = value => data.msaaSamples = (MSAASamples)value, enumNames = s_MsaaSamplesDebugStrings, enumValues = s_MsaaSamplesDebugValues, getIndex = () => data.msaaSampleDebugModeEnumIndex, setIndex = value => data.msaaSampleDebugModeEnumIndex = value },
});
}

widgetList.AddRange(new DebugUI.Widget[]
{
Expand Down
8 changes: 4 additions & 4 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 @@ -537,9 +537,6 @@ public HDRenderPipeline(HDRenderPipelineAsset asset, HDRenderPipelineAsset defau
// TODO : Bind this directly to the debug menu instead of having an intermediate value
m_MSAASamples = m_Asset ? m_Asset.currentPlatformRenderPipelineSettings.msaaSampleCount : MSAASamples.None;

// Propagate it to the debug menu
m_DebugDisplaySettings.data.msaaSamples = m_MSAASamples;

#if ENABLE_VIRTUALTEXTURES
// Debug.Log("Scriptable renderpipeline VT enabled");
m_MRTTransparentMotionVec = new RenderTargetIdentifier[2 + VTBufferManager.AdditionalForwardRT];
Expand Down Expand Up @@ -2285,7 +2282,10 @@ AOVRequestData aovRequest
else
{
// Make sure we are in sync with the debug menu for the msaa count
m_MSAASamples = m_DebugDisplaySettings.data.msaaSamples;
m_MSAASamples = (m_DebugDisplaySettings.data.msaaSamples != MSAASamples.None) ?
m_DebugDisplaySettings.data.msaaSamples :
m_Asset.currentPlatformRenderPipelineSettings.msaaSampleCount;

m_SharedRTManager.SetNumMSAASamples(m_MSAASamples);

m_DebugDisplaySettings.UpdateCameraFreezeOptions();
Expand Down