Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
3 changes: 2 additions & 1 deletion com.unity.render-pipelines.high-definition/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fix for lookdev toggling renderers that are set to non editable or are hidden in the inspector.
- Fixed issue with mipmap debug mode not properly resetting full screen mode (and viceversa).
- Added unsupported message when using tile debug mode with MSAA.

- Fixed the dependecy of FrameSettings (MSAA, ClearGBuffer, DepthPrepassWithDeferred) (case 1277620).

### Changed
- Preparation pass for RTSSShadows to be supported by render graph.
- Add tooltips with the full name of the (graphics) compositor properties to properly show large names that otherwise are clipped by the UI (case 1263590)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,13 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized,

bool hdrpAssetSupportForward = hdrpSettings.supportedLitShaderMode != RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly;
bool hdrpAssetSupportDeferred = hdrpSettings.supportedLitShaderMode != RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly;
bool hdrpAssetIsForward = hdrpSettings.supportedLitShaderMode == RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly;
bool hdrpAssetIsDeferred = hdrpSettings.supportedLitShaderMode == RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly;

bool frameSettingsOverrideToForward = serialized.GetOverrides(FrameSettingsField.LitShaderMode) && serialized.litShaderMode == LitShaderMode.Forward;
bool frameSettingsOverrideToDeferred = serialized.GetOverrides(FrameSettingsField.LitShaderMode) && serialized.litShaderMode == LitShaderMode.Deferred;
bool defaultForwardUsed = !serialized.GetOverrides(FrameSettingsField.LitShaderMode) && defaultShaderLitMode == LitShaderMode.Forward;
bool defaultDefferedUsed = !serialized.GetOverrides(FrameSettingsField.LitShaderMode) && defaultShaderLitMode == LitShaderMode.Deferred;
bool msaaEnablable = hdrpAssetSupportForward && hdrpSettings.supportMSAA && (frameSettingsOverrideToForward || defaultForwardUsed);
bool depthPrepassEnablable = hdrpAssetSupportDeferred && (defaultDefferedUsed || frameSettingsOverrideToDeferred);
bool msaaEnablable = (hdrpAssetSupportForward && hdrpSettings.supportMSAA && (frameSettingsOverrideToForward || defaultForwardUsed)) || (hdrpAssetIsForward && hdrpSettings.supportMSAA);
area.AmmendInfo(FrameSettingsField.MSAA,
overrideable: () => msaaEnablable,
overridedDefaultValue: msaaEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.MSAA),
Expand All @@ -194,6 +195,9 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized,
throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode");
}
});

bool defaultDeferredUsed = !serialized.GetOverrides(FrameSettingsField.LitShaderMode) && defaultShaderLitMode == LitShaderMode.Deferred;
bool depthPrepassEnablable = (hdrpAssetSupportDeferred && (defaultDeferredUsed || frameSettingsOverrideToDeferred)) || (hdrpAssetIsDeferred);
area.AmmendInfo(FrameSettingsField.DepthPrepassWithDeferredRendering,
overrideable: () => depthPrepassEnablable,
overridedDefaultValue: depthPrepassEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.DepthPrepassWithDeferredRendering),
Expand All @@ -206,7 +210,26 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized,
case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly:
return true;
case RenderPipelineSettings.SupportedLitShaderMode.Both:
return frameSettingsOverrideToDeferred || defaultDefferedUsed;
return frameSettingsOverrideToDeferred || defaultDeferredUsed;
default:
throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode");
}
});

bool clearGBufferEnablable = (hdrpAssetSupportDeferred && (defaultDeferredUsed || frameSettingsOverrideToDeferred)) ||(hdrpAssetIsDeferred);
area.AmmendInfo(FrameSettingsField.ClearGBuffers,
overrideable: () => clearGBufferEnablable,
overridedDefaultValue: clearGBufferEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.ClearGBuffers),
customOverrideable: () =>
{
switch (hdrpSettings.supportedLitShaderMode)
{
case RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly:
return false;
case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly:
return true;
case RenderPipelineSettings.SupportedLitShaderMode.Both:
return frameSettingsOverrideToDeferred || defaultDeferredUsed;
default:
throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode");
}
Expand Down