-
Notifications
You must be signed in to change notification settings - Fork 849
Fixed the dependecy of FrameSettings (MSAA, ClearGBuffer, DepthPrepassWithDeferred) (case 1277620). #1915
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.
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
Fixed the dependecy of FrameSettings (MSAA, ClearGBuffer, DepthPrepassWithDeferred) (case 1277620). #1915
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
57846f4
Fixed the dependecy of FrameSettings (MSAA, ClearGBuffer, DepthPrepas…
anisunity da34e78
fixing typos
anisunity 1192425
Merge branch 'HDRP/staging' into HDRP/fix1277620
sebastienlagarde d4f4d11
Update FrameSettingsUI.Drawers.cs
sebastienlagarde File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 hdrpAssetIsDeffered = 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); | ||
JulienIgnace-Unity marked this conversation as resolved.
Show resolved
Hide resolved
|
||
area.AmmendInfo(FrameSettingsField.MSAA, | ||
overrideable: () => msaaEnablable, | ||
overridedDefaultValue: msaaEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.MSAA), | ||
|
@@ -194,6 +195,9 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, | |
throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); | ||
} | ||
}); | ||
|
||
bool defaultDefferedUsed = !serialized.GetOverrides(FrameSettingsField.LitShaderMode) && defaultShaderLitMode == LitShaderMode.Deferred; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. typo deffered |
||
bool depthPrepassEnablable = (hdrpAssetSupportDeferred && (defaultDefferedUsed || frameSettingsOverrideToDeferred)) || (hdrpAssetIsDeffered); | ||
area.AmmendInfo(FrameSettingsField.DepthPrepassWithDeferredRendering, | ||
overrideable: () => depthPrepassEnablable, | ||
overridedDefaultValue: depthPrepassEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.DepthPrepassWithDeferredRendering), | ||
|
@@ -212,6 +216,25 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, | |
} | ||
}); | ||
|
||
bool clearGBufferEnablable = (hdrpAssetSupportDeferred && (defaultDefferedUsed || frameSettingsOverrideToDeferred)) ||(hdrpAssetIsDeffered); | ||
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 || defaultDefferedUsed; | ||
default: | ||
throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); | ||
} | ||
}); | ||
|
||
area.AmmendInfo(FrameSettingsField.RayTracing, overrideable: () => hdrpSettings.supportRayTracing); | ||
area.AmmendInfo(FrameSettingsField.MotionVectors, overrideable: () => hdrpSettings.supportMotionVectors); | ||
area.AmmendInfo(FrameSettingsField.ObjectMotionVectors, overrideable: () => hdrpSettings.supportMotionVectors); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
type deffered => deferred