Skip to content

Conversation

PaulDemeulenaere
Copy link
Contributor


Purpose of this PR

Backport of #4733


Testing status

Awaiting for Yamato ⏳


Comments to reviewers

N/A

PaulDemeulenaere and others added 3 commits August 27, 2021 09:36
* Update changelog

# Conflicts:
#	com.unity.visualeffectgraph/CHANGELOG.md

* Different depth computation for orthographic camera

# Conflicts:
#	com.unity.visualeffectgraph/CHANGELOG.md

* Restore change from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/211/commits/8169e083d9b68114bd7a248ebba1dfba38fca3f5

But using URP specific helper "LinearDepthToEyeDepth"

* FIx issue 1330697

Correctly applying the flip-y when appropriate while sampling

* Fix scaling using dedicated URP helper

It's simpler than reimplement the space transform and equivalent

* Update com.unity.render-pipelines.universal/Runtime/VFXGraph/Shaders/VFXCommon.hlsl

Fix comment

Co-authored-by: Elvar Örn Unnþórsson <ellioman@ellioman.com>

* Fix issue #4733 (comment)

Remove VFXLinearEyeDepth & VFXLinearEyeDepthOrthographic from the SRP specific implementation
Synchronize implementation for VFXLinearEyeDepth in VFXCommonCompute.hlsl (not used anyway)
TODO : Move LinearDepthToEyeDepth in core for 21.2

Co-authored-by: Ludovic Theobald <ludovic.theobald@unity3d.com>
Co-authored-by: Elvar Örn Unnþórsson <ellioman@ellioman.com>
# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
#	com.unity.render-pipelines.universal/Runtime/VFXGraph/Shaders/VFXCommon.hlsl
#	com.unity.visualeffectgraph/CHANGELOG.md
Apply VFXSampleDepth for URP on the correct file
@PaulDemeulenaere PaulDemeulenaere marked this pull request as ready for review August 27, 2021 12:17
@PaulDemeulenaere PaulDemeulenaere requested review from a team as code owners August 27, 2021 12:17
Copy link
Contributor

@ludovic-theobald ludovic-theobald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

Copy link
Contributor

@erikabar erikabar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving without testing as the original PR was already tested

@phi-lira phi-lira merged commit d9f7a20 into 2021.1/staging Sep 6, 2021
@phi-lira phi-lira deleted the 2021.1/vfx/fix/soft-particles-ortho-and-flip branch September 6, 2021 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants