[9.x.x backport] 9.x.x/universal/backport/fix urp marker errors - #1329
Merged
Verasl merged 5 commits intoJul 21, 2020
Conversation
* Modified the default .Get() for CommandBufferPool to give an actually nameless CommandBuffer * Remove named CommandBuffers when also using ProfilingScopes. # Conflicts: # com.unity.render-pipelines.universal/Runtime/Passes/DepthNormalOnlyPass.cs # com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs
# Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md
…Scopes. # Conflicts: # com.unity.render-pipelines.universal/Runtime/DeferredLights.cs # com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs # com.unity.render-pipelines.universal/Runtime/Passes/ColorGradingLutPass.cs # com.unity.render-pipelines.universal/Runtime/Passes/CopyColorPass.cs # com.unity.render-pipelines.universal/Runtime/Passes/CopyDepthPass.cs # com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs # com.unity.render-pipelines.universal/Runtime/Passes/SceneViewDepthCopy.cs # com.unity.render-pipelines.universal/Runtime/Passes/ScreenSpaceShadowResolvePass.cs # com.unity.render-pipelines.universal/Runtime/Passes/XROcclusionMeshPass.cs # com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs # com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs # com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs
|
It appears that you made a non-draft PR! |
10 tasks
Contributor
|
ABV is failing |
rainsing
approved these changes
Jul 20, 2020
phi-lira
approved these changes
Jul 21, 2020
eh-unity
commented
Jul 21, 2020
Contributor
Author
|
Managed to reproduce and fix the test failures. The reason was incorrect merge operation that resulted in deletion of a draw call. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Purpose of this PR
Backport profiling marker fixes.
Parent #1250
Testing status
Manual Tests: What did you do?
Automated Tests: What did you setup? (Add a screenshot or the reference image of the test please)
Yamato: (Select your branch):
https://yamato.prd.cds.internal.unity3d.com/jobs/902-Graphics
Any test projects to go with this to help reviewers?
Comments to reviewers
I had to redo couple files as indenting/whitespace edits on non/matching files made conflict resolve difficult.
I also had some difficulties running the tests due to changes outside of the scope of this PR. Partial result indicates this PR is good at least locally.