Skip to content

[ShaderGraph] [2022.1] [Ruby] Fix regression in screen position when using XR #5867

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

Merged
merged 6 commits into from
Oct 7, 2021
Merged

[ShaderGraph] [2022.1] [Ruby] Fix regression in screen position when using XR #5867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
97fbc5c
Unblock XR test by use old code
Sep 30, 2021
a1f4747
Adding changelog
Sep 30, 2021
f9c77a3
Update dependencies to provide screen position to NDCposition
Sep 30, 2021
afe74f0
Fix for GLES flipping
Oct 1, 2021
ef18aab
Removing changes to other pipelines (for now -- will follow up with m…
Oct 1, 2021
64b9982
Merge branch 'universal/staging' into sg/fix/1369450
phi-lira Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.universal/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed
- Fixed the LensFlare flicker with TAA on SceneView (case 1356734).
- Fixed an issue where Unlit and ParticlesUnlit shaders did not have HDR color selection for albedo [case 1283767](https://issuetracker.unity3d.com/issues/built-in-unlit-particle-shader-has-hdr-color-selection-for-albedo-urp-unlit-particles-do-not)
- Fixed a regression where ShaderGraph screen position was not correct in game view and when using XR [1369450]
- Fixed overwriting of preview camera background color. [case 1357004](https://issuetracker.unity3d.com/product/unity/issues/guid/1361557/)
- Fixed ShadowCaster now requires varying normalWS to include changed normals from vertex shader in shader graph.
- Fixed decals to work with native render pass [case 1353141](https://issuetracker.unity3d.com/issues/urp-decals-are-not-visible-in-game-view-after-modifying-urp-asset-properties)
Expand Down
9 changes: 9 additions & 0 deletions com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/SharedCode.template.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,16 @@ SurfaceDescriptionInputs BuildSurfaceDescriptionInputs(Varyings input)
$SurfaceDescriptionInputs.AbsoluteWorldSpacePositionPredisplacement:output.AbsoluteWorldSpacePositionPredisplacement = GetAbsolutePositionWS(input.positionWS);
$SurfaceDescriptionInputs.ScreenPosition: output.ScreenPosition = ComputeScreenPos(TransformWorldToHClip(input.positionWS), _ProjectionParams.x);
$SurfaceDescriptionInputs.PixelPosition: output.PixelPosition = input.positionCS.xy;
$SurfaceDescriptionInputs.NDCPosition: #if defined(USING_STEREO_MATRICES)
$SurfaceDescriptionInputs.NDCPosition: output.NDCPosition = output.ScreenPosition.xy / output.ScreenPosition.w;
$SurfaceDescriptionInputs.NDCPosition: #else
$SurfaceDescriptionInputs.NDCPosition: output.NDCPosition = output.PixelPosition.xy / _ScreenParams.xy;
$SurfaceDescriptionInputs.NDCPosition: #if UNITY_UV_STARTS_AT_TOP
$SurfaceDescriptionInputs.NDCPosition: output.NDCPosition.y = (0.5f - output.NDCPosition.y) * _ProjectionParams.x + 0.5f;
$SurfaceDescriptionInputs.NDCPosition: #else
$SurfaceDescriptionInputs.NDCPosition: output.NDCPosition.y = (output.NDCPosition.y - 0.5f) * _ProjectionParams.x + 0.5f;
$SurfaceDescriptionInputs.NDCPosition: #endif
$SurfaceDescriptionInputs.NDCPosition: #endif
$SurfaceDescriptionInputs.uv0: output.uv0 = input.texCoord0;
$SurfaceDescriptionInputs.uv1: output.uv1 = input.texCoord1;
$SurfaceDescriptionInputs.uv2: output.uv2 = input.texCoord2;
Expand Down
4 changes: 2 additions & 2 deletions com.unity.shadergraph/Editor/Generation/TargetResources/FieldDependencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ internal static class FieldDependencies
new FieldDependency(StructFields.SurfaceDescriptionInputs.TangentSpaceViewDirection, StructFields.SurfaceDescriptionInputs.WorldSpaceNormal),

new FieldDependency(StructFields.SurfaceDescriptionInputs.ScreenPosition, StructFields.SurfaceDescriptionInputs.WorldSpacePosition),
// new FieldDependency(StructFields.SurfaceDescriptionInputs.PixelPosition, StructFields.Varyings.vpos),
new FieldDependency(StructFields.SurfaceDescriptionInputs.NDCPosition, StructFields.SurfaceDescriptionInputs.PixelPosition),
new FieldDependency(StructFields.SurfaceDescriptionInputs.NDCPosition, StructFields.SurfaceDescriptionInputs.PixelPosition), // for non-XR
new FieldDependency(StructFields.SurfaceDescriptionInputs.NDCPosition, StructFields.SurfaceDescriptionInputs.ScreenPosition), // for XR

new FieldDependency(StructFields.SurfaceDescriptionInputs.uv0, StructFields.Varyings.texCoord0),
new FieldDependency(StructFields.SurfaceDescriptionInputs.uv1, StructFields.Varyings.texCoord1),
Expand Down