Skip to content

Conversation

nerites
Copy link
Contributor

@nerites nerites commented Oct 7, 2021

Please read the Contributing guide before making a PR.

Checklist for PR maker

  • Have you added a backport label (if needed)? For example, the need-backport-* label. After you backport the PR, the label changes to backported-*.
  • Have you updated the changelog? Each package has a CHANGELOG.md file.
  • [n/a] Have you updated or added the documentation for your PR? When you add a new feature, change a property name, or change the behavior of a feature, it's best practice to include related documentation changes in the same PR. If you do add documentation, make sure to add the relevant Graphics Docs team member as a reviewer of the PR. If you are not sure which person to add, see the Docs team contacts sheet.
  • [n/a] Have you added a graphic test for your PR (if needed)? When you add a new feature, or discover a bug that tests don't cover, please add a graphic test.

Purpose of this PR

At some point, a toggle for LOD crossfade was added to the HD Lit target. It's off by default, which disabled crossfading on the SpeedTree 8 shadergraph. Re-enable crossfade.


Testing status

Confirmed crossfade works on speed trees again.

hdcrossfade


Comments to reviewers

I know this is broken on 12.x.x (since that's where the speedtree folks found it). Does 21.1 and 10.x.x also need a backport? When did this target toggle get added?

@github-actions
Copy link

github-actions bot commented Oct 7, 2021

Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
Link to Yamato: https://unity-ci.cds.internal.unity3d.com/project/902/
Search for your PR branch using the search bar at the top, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)

HDRP
/jobDefinition/.yamato%2Fall-hdrp.yml%23HDRP_trunk
With changes to HDRP packages, you should also run
/jobDefinition/.yamato%252Fall-lightmapper.yml%2523PR_LightMapper_trunk

Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.

@github-actions
Copy link

github-actions bot commented Oct 7, 2021

It appears that you made a non-draft PR!
Please convert your PR to draft (button on the right side of the page).
See the PR template for more information.
Thank you!

@sebastienlagarde sebastienlagarde requested a review from a team October 12, 2021 17:45
Copy link
Contributor

@TomasKiniulis TomasKiniulis left a comment

Choose a reason for hiding this comment

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

Did a quick check with a bunch of trees scattered around and Animate Cross-Fading toggled/retoggled. Crossfade works as expected now.

PR

PR.mp4
2021-10-13.10-11-48.mp4

master

master.mp4

@DavidLlewelyn
Copy link
Contributor

Unable to verify the fix using:

Version: 2022.1.0a11.1413
Revision: trunk ae01f5fb527d
Built: Thu, 23 Sep 2021 11:13:59 GMT

and

5469b77

Have pinged @tian-unity directly.

@nerites
Copy link
Contributor Author

nerites commented Oct 13, 2021

I wasn't able to reproduce the issues David was seeing with the information I got from him. Since this fix is fairly self-contained and Tomas was able to confirm it, is it ok to merge anyways?

@nerites nerites merged commit 475b50e into master Oct 14, 2021
@nerites nerites deleted the speedtree/hdcrossfade branch October 14, 2021 20:03
sebastienlagarde added a commit that referenced this pull request Oct 18, 2021
* Fixed initial decal position #5889

* Fix APV issue spewing asserts when baking with max subdiv level of 2 (#5888)

* Add override checkbox.

* Fix for problem when max subdiv is smaller than index voxel update size.

* Revert "Merge branch 'HDRP/add-override-checkbox-for-pv' into HDRP/investigate-issue-with-faulty-index"

This reverts commit e33a421, reversing
changes made to 924763f.

* Skip refresh ops if feature is disabled. (#5886)

* Fixed the clouds not taking properly into account the fog when in distant mode and with a close far plane (case 1367993). (#5884)

* Fixed the clouds not taking properly into account the fog when in distant mode and with a close far plane (case 1367993).

* Fix formatting

* Update CHANGELOG.md

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* To info box (#5879)

* Add override checkbox. (#5878)

* corrected links to HDAdditionalLightData and HDLightTypeAndShape (#5861)

* updated link to expert guide (#5857)

* Add comment (#5853)

* [HDRP][Path Tracing] Added selection of light types for Unlit shadow mattes. #5855

* Maintain APV cells loaded if at least one scene still references that cell  (#5900)

* Add override checkbox.

* Fix for problem when max subdiv is smaller than index voxel update size.

* Revert "Merge branch 'HDRP/add-override-checkbox-for-pv' into HDRP/investigate-issue-with-faulty-index"

This reverts commit e33a421, reversing
changes made to 924763f.

* Add a basic APV test to runtime tests (#5952)

* New test

* Tentative ref images

* Change threshold to be non-zero.

* Forgot one threshold...

* Add test filter.

* [HDRP] APV - Fix voxelization issues with planes at the origin (#5897)

* Fix precision issues with the scene voxelization, especially with geometry at the origin.

* Updated changelog

* Fix renderer bounds for the plane case

* disable debug

* rename epsilon

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>

* Fix another issue with probe volume subdiv multiplier when changing to a lower subdiv level (#5893)

* Add override checkbox.

* Fix for problem when max subdiv is smaller than index voxel update size.

* Revert "Merge branch 'HDRP/add-override-checkbox-for-pv' into HDRP/investigate-issue-with-faulty-index"

This reverts commit e33a421, reversing
changes made to 924763f.

* Fix issue

* Revert "Fix for problem when max subdiv is smaller than index voxel update size."

This reverts commit 03feabd.

* Fixed the volumetric clouds debug view not taking into account the exposure and leading to Nans (case 1365054). (#5940)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Change order of fields in the cbuffer. (#5980)

Co-authored-by: FrancescoC-Unity <francescoc@unity3d.com>

* Fixed the dependency between transparent SSR and transparent depth prepass being implicit (case 1365915). (#5898)

* Fixed the dependency between transparent SSR and transparent depth prepass being implicit (case 1365915).

* review corrections

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Updating docs for merged PRs (#5821)

* PR #5459

Updated the docs changed in "Add high quality antialiasing example using the accumulation api" PR.

* Doc fixes

Fixed typo and changed SuperSampling "effect" to "method"

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [Fogbugz # 1365687] Fixing depth pyramid with multicamera on hardware drs. #5902

* Fix (#5994)

* release cmd (#5993)

* test linux vulkan and OSX filter out. (#5989)

* Fixed removal of depth buffer binding (#5910)

* Fixed removal of depth buffer binding

* Add object in graphic test

* screenshots

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP][Path Tracing] Added orthographic camera support #5944

* Fixed a regression in the transparent SSR color pyramid usage. (#6001)

* Fixed a regression in the transparent SSR color pyramid usage.

* Update CHANGELOG.md

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Reenable crossfade on the HD SpeedTree 8 shader. #5957

* Force scalarization of shadow index data off (#6007)

* Fixes for light anchor #5915

* Minor performance improvements to SSGI (case 1367144). #5921

* Update TestCaseFilters.asset

Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com>
Co-authored-by: emilybrown1 <88374601+emilybrown1@users.noreply.github.com>
Co-authored-by: Emmanuel Turquin <emmanuel@turquin.org>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>
Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: FrancescoC-Unity <francescoc@unity3d.com>
Co-authored-by: Vic Cooper <63712500+Vic-Cooper@users.noreply.github.com>
Co-authored-by: Kleber Garcia <kleber.garcia@unity3d.com>
Co-authored-by: Tianliang Ning <paula.s.ning@gmail.com>
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