Skip to content
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

Internal/2023.1/staging #7948

Merged
merged 6 commits into from
Aug 23, 2023
Merged

Conversation

UnityAljosha
Copy link
Collaborator

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.
  • 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.
  • 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

Why is this PR needed, what hard problem is it solving/fixing?


Testing status

Describe what manual/automated tests were performed for this PR


Comments to reviewers

Notes for the reviewers you have assigned.

RobJessop and others added 6 commits August 7, 2023 10:32
Regular docs sync to main.
https://jira.unity3d.com/browse/UUM-41498
We wait for pipeline creation only for Materials, Models and Prefabs as they can have pipeline depend rendering.
… when an expression is connected to activation slot

With the addition of activation slots in operators, the SpawnerSetAttribute operator can sometimes have 2 parameters instead of 1, if there is an expression connected to the activation slot.
When this happens, the code assumes that the first parameter is the expression for the activation slot, and the second one is the attribute. However, this was never enforced when compiling the graph, leaving the order (and therefore the behavior) undefined, depending on the order in which they are stored by a Dictionary.
We fixed it by explicitly sorting the values in the spawner system tasks. The sorting is done by expression index, to be consistent with the sorting in the particle system, with the exception the the activation slot, that is forced to be always first.

The fact that the JIRA reproduces the issue activating "Runtime mode" is unrelated, it leads to a different order of the expressions that happens to trigger this.
Regular docs sync to main.
Fix [UUM-40046: SpeedTree Crossfade LOD transition doesn't work in URP](https://jira.unity3d.com/browse/UUM-40046) 

Backport of: https://github.cds.internal.unity3d.com/unity/unity/pull/31026

**CHANGES**

- URP: the LOD_FADE_CROSSFADE keyword is now defined both for VS and PS instead of PS-only
- Update SpeedTree8_PBRLit.shadergraph to let Unity handle Crossfade instead of using own LOD dithering
- Added new unit test scene to URP_Terrain: `059_SpeedTree_LODTransition`
  - Enabled Crossfade on URP Settings asset using blue noise
  - Disabled XR tests, threshold required to ensure correctness is too low, always detects XR's 'Development Text' overlay
      - See [Failing Yamato Job](https://unity-ci.cds.internal.unity3d.com/job/25810642/results)
      - Error: 0.000770954532f | Threshold: 0.00075

 - [Slack chat](https://unity.slack.com/archives/C89KFUUCT/p1687810636577309)
@UnityAljosha UnityAljosha requested review from a team as code owners August 23, 2023 09:13
@UnityAljosha UnityAljosha merged commit 96022fa into 2023.1/staging Aug 23, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants