-
Notifications
You must be signed in to change notification settings - Fork 860
[7.x.x] [VFX] Fix graphic test when individually launched (backport) #1144
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
sebastienlagarde
merged 15 commits into
7.x.x/release
from
7.x.x/vfx/fix/graphic-test-in-isolation
Nov 30, 2020
Merged
[7.x.x] [VFX] Fix graphic test when individually launched (backport) #1144
sebastienlagarde
merged 15 commits into
7.x.x/release
from
7.x.x/vfx/fix/graphic-test-in-isolation
Nov 30, 2020
Conversation
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
…aph/commit/6d165da2073410024e3fc3dac4ff6f550207ab84 # Conflicts: # com.unity.testing.visualeffectgraph/Tests/Runtime/VFXGraphicsTests.cs
This reverts commit 499816f.
…tion # Conflicts: # TestProjects/VisualEffectGraph_HDRP/Assets/ActualImages/Linear/WindowsEditor/Direct3D11/None/RenderStates.png # TestProjects/VisualEffectGraph_HDRP/Assets/ActualImages/Linear/WindowsEditor/Direct3D11/None/RenderStates.png.meta # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/ConformAndSDF.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/ConformAndSDF.png.meta # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/ConformAndSDF.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/ConformAndSDF.png.meta # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/RenderStates.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/RenderStates.png.meta
…tion # Conflicts: # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/23_ParameterBinders.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/23_ParameterBinders.png # com.unity.testing.visualeffectgraph/Tests/Runtime/VFXGraphicsTestSettings.cs
Previous merge had reverted this file.
Contributor
Author
|
@julienf-unity _ABV is all green, ready to be merged ! |
Contributor
Author
Not valid anymore since #2777 has been merged. |
sebastienlagarde
approved these changes
Nov 30, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Fix totaltime/delta time issue while running graphic individually vs. in a row :
See : https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/235
Tested locally only using
2019.4.4f1_bbe