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.

Sign up for GitHub

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

Jump to bottom

[11.x.x] Fixed terrain and speed tree shaders missing XR macros #2663

Merged
merged 5 commits into from Dec 16, 2020
Merged

[11.x.x] Fixed terrain and speed tree shaders missing XR macros #2663

merged 5 commits into from Dec 16, 2020

Conversation

thomas-zeng
Copy link
Contributor

@thomas-zeng thomas-zeng commented Nov 18, 2020 •
edited

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

  • Fixed some terrain and speed tree shaders missing XR macros in frag stage.

Testing status

  • ABV

Comments to reviewers

Notes for the reviewers you have assigned.

@thomas-zeng thomas-zeng marked this pull request as ready for review November 18, 2020 15:41
@thomas-zeng thomas-zeng requested a review from a team as a code owner November 18, 2020 15:41
@phi-lira
Copy link
Contributor

Failures on yamato seem related to min AABB issues. Can you merge master and rerun it again?

@thomas-zeng thomas-zeng removed the request for review from DennisDeRykeUnity December 1, 2020 20:17
@thomas-zeng thomas-zeng added ready-to-merge Add this tag whenever your PR is ready to be merged. i.e, non draft, all reviewers approved, ABV and removed ready-to-merge Add this tag whenever your PR is ready to be merged. i.e, non draft, all reviewers approved, ABV labels Dec 1, 2020
ryanhy-unity
ryanhy-unity approved these changes Dec 3, 2020
View reviewed changes
Copy link

@ryanhy-unity ryanhy-unity left a comment

Choose a reason for hiding this comment

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

Tested with Mock HMD on DX11 and Oculus Quest Multiview GLES3 with branch universal/ssao-deferred-support merged as well and the SSAO looked good and aligned in both eyes. The testing was done with the xr end to end URP test project.

@thomas-zeng
Copy link
Contributor Author

thomas-zeng commented Dec 7, 2020 •
edited

PR failed couple URP tests but when I check master ABV I can spot similar failure. I believe this PR won't introduce those failures.

@thomas-zeng thomas-zeng added the ready-to-merge Add this tag whenever your PR is ready to be merged. i.e, non draft, all reviewers approved, ABV label Dec 7, 2020
@phi-lira phi-lira added need-backport-2021.1 and removed ready-to-merge Add this tag whenever your PR is ready to be merged. i.e, non draft, all reviewers approved, ABV labels Dec 16, 2020
@phi-lira phi-lira merged commit ed935dd into master Dec 16, 2020
@phi-lira phi-lira deleted the universal/xr/fix-terrain-tree branch December 16, 2020 14:33
thomas-zeng added a commit that referenced this pull request Jan 21, 2021
@thomas-zeng
[11.x.x] Fixed terrain and speed tree shaders missing XR macros (#2663)
25ca29b 
* Fixed terrain and speed tree shaders missing XR macros.

* Fixed speedtreev8 shader issue.
thomas-zeng added a commit that referenced this pull request Jan 21, 2021
@thomas-zeng
[11.x.x] Fixed terrain and speed tree shaders missing XR macros (#2663)
3c16eb7 
* Fixed terrain and speed tree shaders missing XR macros.

* Fixed speedtreev8 shader issue.
This was referenced Jan 21, 2021
Merged
Merged
ellioman pushed a commit that referenced this pull request Feb 12, 2021
@thomas-zeng
[11.x.x] Fixed terrain and speed tree shaders missing XR macros (#2663)…
1d9a855 
… (#3210)

* Fixed terrain and speed tree shaders missing XR macros.

* Fixed speedtreev8 shader issue.
phi-lira pushed a commit that referenced this pull request Mar 2, 2021
@thomas-zeng
[11.x.x] Fixed terrain and speed tree shaders missing XR macros (#2663)…
ae49df3 
… (#3209)

* Fixed terrain and speed tree shaders missing XR macros.

* Fixed speedtreev8 shader issue.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phi-lira phi-lira phi-lira approved these changes

@ryanhy-unity ryanhy-unity ryanhy-unity approved these changes

@fabien-unity fabien-unity fabien-unity approved these changes

Assignees
No one assigned
Labels
backported-10.x backported-2021.1 universal XR
Projects
None yet
Milestone
No milestone
4 participants
@thomas-zeng @phi-lira @ryanhy-unity @fabien-unity