Skip to content

[10.x.x] Fixed mirror view shader reading wrong viewport region from the eye textures #2283

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
Closed
wants to merge 3 commits into from
Closed

[10.x.x] Fixed mirror view shader reading wrong viewport region from the eye textures #2283

wants to merge 3 commits into from

Conversation

@thomas-zeng
Copy link
Contributor

@thomas-zeng thomas-zeng commented Oct 19, 2020 •
edited
Loading

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 https://fogbugz.unity3d.com/f/cases/1286161/
Requires mock provider side fix to work: https://github.cds.internal.unity3d.com/unity/xr.sdk.mock-hmd/pull/28

Testing status

Describe what manual/automated tests were performed for this PR

Comments to reviewers

Notes for the reviewers you have assigned.

@thomas-zeng thomas-zeng marked this pull request as ready for review October 20, 2020 00:24
@thomas-zeng thomas-zeng requested a review from a team as a code owner October 20, 2020 00:24
fabien-unity
fabien-unity reviewed Oct 20, 2020
View reviewed changes
com.unity.render-pipelines.universal/Shaders/XR/XRMirrorView.hlsl Outdated
output.positionCS.xy = output.positionCS.xy * float2(2.0f, -2.0f) + float2(-1.0f, 1.0f); //convert to -1..1

#if UNITY_UV_STARTS_AT_TOP
// Unity viewport converntion is bottom left as origin. Adjust Scalebias to read the correct region.
Copy link
Collaborator

@fabien-unity fabien-unity Oct 20, 2020

Choose a reason for hiding this comment

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

typo converntion -> convention

ryanhy-unity
ryanhy-unity approved these changes Oct 22, 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.

run locally the editor game view looked good using Mock HMD. Thomas tested locally with standalone which worked well there too. Oculus is still not functioning properly but this is being tracked separately so shouldn't prevent this change.

The associated Mock HMD changes fixed URP for that provider as well with this change.

phi-lira added a commit that referenced this pull request Oct 26, 2020
@phi-lira
Merge of #2283
795dfbd 
commit 4168f84
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:53:27 2020 -0700

    Fixed typo.
    Updated CHANGELOG.md

commit d9b0581
Merge: 53b2082 8bc58a4
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:50:33 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention

commit 53b2082
Author: thomas-zeng <[email protected]>
Date:   Mon Oct 19 16:47:33 2020 -0700

    Fixed mirror view shader reading wrong viewport region from the eye textures.
@phi-lira phi-lira mentioned this pull request Oct 26, 2020
Closed
phi-lira added a commit that referenced this pull request Oct 27, 2020
@phi-lira
Merge of #2283
71df701 
commit 4168f84
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:53:27 2020 -0700

    Fixed typo.
    Updated CHANGELOG.md

commit d9b0581
Merge: 53b2082 8bc58a4
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:50:33 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention

commit 53b2082
Author: thomas-zeng <[email protected]>
Date:   Mon Oct 19 16:47:33 2020 -0700

    Fixed mirror view shader reading wrong viewport region from the eye textures.
@phi-lira phi-lira mentioned this pull request Oct 27, 2020
Merged
phi-lira added a commit that referenced this pull request Oct 27, 2020
@phi-lira @nigeljw-unity
[11.x.x] Batch of PRs (#2390)
7f764e0 
* Merge of  #2283

commit 4168f84
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:53:27 2020 -0700

    Fixed typo.
    Updated CHANGELOG.md

commit d9b0581
Merge: 53b2082 8bc58a4
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:50:33 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention

commit 53b2082
Author: thomas-zeng <[email protected]>
Date:   Mon Oct 19 16:47:33 2020 -0700

    Fixed mirror view shader reading wrong viewport region from the eye textures.

* Merge of #2253

commit e5e780c
Author: Elvar Örn Unnþórsson <[email protected]>
Date:   Fri Oct 16 10:53:25 2020 +0200

    Hide warnings about mismatched particle normals

    We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
    This causes the standard particle gui to complain, but we should hide this error.

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md

* Merge of #2222

commit bfb132b
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 13 16:45:52 2020 -0700

    Fixed camera matrix not restored after modification.

* Merge of #2284

commit 502a242
Merge: 2c742d8 acaf95d
Author: Nigel John Williams <[email protected]>
Date:   Thu Oct 22 13:30:58 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 2c742d8
Merge: 00042cb 4acb87d
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:52:38 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 00042cb
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:16:20 2020 +0200

    Fix sun source warning text

    Changed sun source warning message to explicitly specify light window's environment settings.

commit 489e90f
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:00:56 2020 +0200

    Fix code comment about sun light

    Corrected legacy code comment about sun light for selection of main light.

commit 51e3147
Author: Nigel John Williams <[email protected]>
Date:   Fri Oct 16 16:50:03 2020 +0200

    Restrict sun source to only directional lights and display warning message if user changes the sun light type.

* Merge of #2135

commit 6633ec9
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:30:22 2020 -0700

    Updated CHANGELOG.md.

commit 7078aa1
Merge: a706832 52ec802
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:28:14 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/clamp-msaa

commit a706832
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 8 10:34:38 2020 -0700

    Added next power of 2 logic and clamp logic to XR msaa setter.

* Added missing changelog for #2284

Co-authored-by: Nigel John Williams <[email protected]>
@phi-lira
Copy link
Contributor

phi-lira commented Oct 27, 2020

Closing. Merged in: #2390

@phi-lira phi-lira closed this Oct 27, 2020
phi-lira added a commit that referenced this pull request Oct 27, 2020
@phi-lira @nigeljw-unity
Backport of (#2390)
2d8aa37 
* Merge of  #2283

commit 4168f84
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:53:27 2020 -0700

    Fixed typo.
    Updated CHANGELOG.md

commit d9b0581
Merge: 53b2082 8bc58a4
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:50:33 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention

commit 53b2082
Author: thomas-zeng <[email protected]>
Date:   Mon Oct 19 16:47:33 2020 -0700

    Fixed mirror view shader reading wrong viewport region from the eye textures.

* Merge of #2253

commit e5e780c
Author: Elvar Örn Unnþórsson <[email protected]>
Date:   Fri Oct 16 10:53:25 2020 +0200

    Hide warnings about mismatched particle normals

    We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
    This causes the standard particle gui to complain, but we should hide this error.

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md

* Merge of #2222

commit bfb132b
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 13 16:45:52 2020 -0700

    Fixed camera matrix not restored after modification.

* Merge of #2284

commit 502a242
Merge: 2c742d8 acaf95d
Author: Nigel John Williams <[email protected]>
Date:   Thu Oct 22 13:30:58 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 2c742d8
Merge: 00042cb 4acb87d
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:52:38 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 00042cb
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:16:20 2020 +0200

    Fix sun source warning text

    Changed sun source warning message to explicitly specify light window's environment settings.

commit 489e90f
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:00:56 2020 +0200

    Fix code comment about sun light

    Corrected legacy code comment about sun light for selection of main light.

commit 51e3147
Author: Nigel John Williams <[email protected]>
Date:   Fri Oct 16 16:50:03 2020 +0200

    Restrict sun source to only directional lights and display warning message if user changes the sun light type.

* Merge of #2135

commit 6633ec9
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:30:22 2020 -0700

    Updated CHANGELOG.md.

commit 7078aa1
Merge: a706832 52ec802
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:28:14 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/clamp-msaa

commit a706832
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 8 10:34:38 2020 -0700

    Added next power of 2 logic and clamp logic to XR msaa setter.

* Added missing changelog for #2284

Co-authored-by: Nigel John Williams <[email protected]>
# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
@phi-lira phi-lira mentioned this pull request Oct 27, 2020
Merged
phi-lira added a commit that referenced this pull request Oct 27, 2020
@phi-lira @nigeljw-unity
Backport of (#2390) (#2396)
a5c1664 
* Merge of  #2283

commit 4168f84
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:53:27 2020 -0700

    Fixed typo.
    Updated CHANGELOG.md

commit d9b0581
Merge: 53b2082 8bc58a4
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:50:33 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention

commit 53b2082
Author: thomas-zeng <[email protected]>
Date:   Mon Oct 19 16:47:33 2020 -0700

    Fixed mirror view shader reading wrong viewport region from the eye textures.

* Merge of #2253

commit e5e780c
Author: Elvar Örn Unnþórsson <[email protected]>
Date:   Fri Oct 16 10:53:25 2020 +0200

    Hide warnings about mismatched particle normals

    We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
    This causes the standard particle gui to complain, but we should hide this error.

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md

* Merge of #2222

commit bfb132b
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 13 16:45:52 2020 -0700

    Fixed camera matrix not restored after modification.

* Merge of #2284

commit 502a242
Merge: 2c742d8 acaf95d
Author: Nigel John Williams <[email protected]>
Date:   Thu Oct 22 13:30:58 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 2c742d8
Merge: 00042cb 4acb87d
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:52:38 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 00042cb
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:16:20 2020 +0200

    Fix sun source warning text

    Changed sun source warning message to explicitly specify light window's environment settings.

commit 489e90f
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:00:56 2020 +0200

    Fix code comment about sun light

    Corrected legacy code comment about sun light for selection of main light.

commit 51e3147
Author: Nigel John Williams <[email protected]>
Date:   Fri Oct 16 16:50:03 2020 +0200

    Restrict sun source to only directional lights and display warning message if user changes the sun light type.

* Merge of #2135

commit 6633ec9
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:30:22 2020 -0700

    Updated CHANGELOG.md.

commit 7078aa1
Merge: a706832 52ec802
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:28:14 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/clamp-msaa

commit a706832
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 8 10:34:38 2020 -0700

    Added next power of 2 logic and clamp logic to XR msaa setter.

* Added missing changelog for #2284

Co-authored-by: Nigel John Williams <[email protected]>
# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
@thomas-zeng thomas-zeng deleted the universal/xr/fix-mirror-view-convention branch October 29, 2020 01:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

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

+2 more reviewers

@ellioman ellioman ellioman approved these changes

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

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backported-10.x universal XR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@thomas-zeng @phi-lira @ellioman @ryanhy-unity @fabien-unity @sebastienlagarde