Platform/gamecore #3292

Adrian1066 · 2021-01-29T08:41:21Z

Please read the Contributing guide before making a PR.

Read the Graphics repository & Yamato FAQ.

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

This PR adds support for the XboxSeries platform to the SRP packages and the PPv2 package.

Testing status

Manual testing with HDRP packages
Testing of HDRP, URP, ShaderGraph and VFXGraph run locally.
Tested on Xbox to check for regressions

Comments to reviewers

PPV2 changes

The Xbox build target is wrapped to allow this package to work even in older versions of Unity as PS5 will not show up as a valid enum member there.

This reverts commit 9738651.

github-actions · 2021-01-29T08:41:50Z

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

sebastienlagarde · 2021-02-17T09:41:59Z

com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/HDShadow.hlsl

    // We need to disable the scalarization here on xbox due to bad code generated by FXC for the eye shader.
    // This shouldn't have an enormous impact since with Area lights we are already exploded in VGPR by this point.
-#if !defined(SHADER_API_XBOXONE) && (defined(PLATFORM_SUPPORTS_WAVE_INTRINSICS) && !defined(LIGHTLOOP_DISABLE_TILE_AND_CLUSTER))
+#if !defined(SHADER_API_XBOXONE) && !defined(SHADER_API_GAMECORE) && (defined(PLATFORM_SUPPORTS_WAVE_INTRINSICS) && !defined(LIGHTLOOP_DISABLE_TILE_AND_CLUSTER))


isn't this working on Xbox? was guessing only gamecore is a problem right?

This is an old problem with just the shadow data scalarization, FXC fails hard with the eye shader here.

If it is a fix for xbox, then we should do a separate PR, it shouldn't be part of the GameCore PR. But yes, as we backport up to 2020.2 it is ok, eye shader wasn't present before

we should add a comment for the shader data scalarezitation for eye sahder, so we don't forget it is because of this.

It was there before and there is a comment up above :)

// We need to disable the scalarization here on xbox due to bad code generated by FXC for the eye shader. // This shouldn't have an enormous impact since with Area lights we are already exploded in VGPR by this point.

esmelusina

Looks fine for SG.

# Conflicts: # com.unity.visualeffectgraph/Shaders/ParticleLinesSW/PassForward.template Todo restore minimal change in #3292 on PassForward.template See https://github.com/Unity-Technologies/Graphics/pull/3292/files#diff-d6bea52c2291e8be1d7e94b7c2016caf6701b7f5993722f9dd082efcbe56d5ccR16

See https://github.com/Unity-Technologies/Graphics/pull/3292/files#diff-d6bea52c2291e8be1d7e94b7c2016caf6701b7f5993722f9dd082efcbe56d5ccR16

Co-authored-by: Adrian1066 <44636759+Adrian1066@users.noreply.github.com>

@julienf

* Squashed commit of the following: commit 1ee68db66657158ac331c590d41a16d06d125283 Merge: f96bff4b1432 d31d7ee Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 12 20:06:58 2021 +0100 Merge branch 'vfx/staging' into vfx/feature/2d-renderer-integration commit f96bff4b1432ae03b7a20b1151a10b3b43bd3db9 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 12 17:53:34 2021 +0100 Fix ParticleLinesSW (TODO: Check & Isolate this fix) commit eb749b7 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 12 17:30:47 2021 +0100 *Add graphicTest for 2D Renderer commit b6998e8 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 12 17:25:32 2021 +0100 Update & Integrate graphicTest commit 95714da Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 12 16:54:12 2021 +0100 Move graphicTest asset commit 3b50012 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 12 16:52:00 2021 +0100 Add graphicTest settings commit bbb4ac6 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 12 16:48:32 2021 +0100 Some rename commit 0497680 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 12 16:46:52 2021 +0100 *Add debug data commit e3c8992 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Feb 11 11:11:31 2021 +0100 *Some wip : identify an issue with sw line in URP commit 0dfca77 Merge: dd43fb5 6136320 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Feb 10 16:54:53 2021 +0100 Merge branch 'vfx/staging' into vfx/feature/2d-renderer-integration commit dd43fb5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Feb 8 16:28:27 2021 +0100 *Test data commit 23a87bb Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Feb 8 16:23:26 2021 +0100 *Add sorting layer UI (TODO : replace by a custom UI) commit 928407c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 5 17:49:20 2021 +0100 *Extend minmal test commit d23dd15 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 5 16:24:44 2021 +0100 *TestData commit 0e3e2b4 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 5 16:14:24 2021 +0100 Fix particle SW (doesn't work in 2D btw) commit 13ca23f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 5 15:29:33 2021 +0100 *test asset for output (wip) commit d4e4b5b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 5 15:19:50 2021 +0100 Add PassForward2D for every urp output commit fe288ae Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Feb 5 11:47:46 2021 +0100 Temp basic scene (& setup sorting layer) commit ed5ebcb Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Feb 4 16:47:11 2021 +0100 Add 2DRenderer in URP list * GraphicTest : Use default zWrite mode * Switch train to zTest always * First step : Remove RenderSortingLayerFields, should do reflection for SortingLayerField * Properly use reflection to avoid breakage due to api change in internal * Temp revert fix to isolate change related to proj computation * Fix line renderer issue due to inverted proj * Update reference image for newly added test * *Update documentation * Reviewed documentation for the visual effect component * Update VisualEffectComponent.md * Reapply change from #3292 See https://github.com/Unity-Technologies/Graphics/pull/3292/files#diff-d6bea52c2291e8be1d7e94b7c2016caf6701b7f5993722f9dd082efcbe56d5ccR16 * Fix compilation * Avoid leaking VFXVertexAdditionalProcess after VFXPassShadow generation : VFXApplyShadowBias was applied to Universal2D @julienf It was an interesting bug the "VFXVertexAdditionalProcess" was remaining after shadow pass generation and was leaking to the following pass "Universal2D" It could have been workaround changing the pass order here : https://github.com/Unity-Technologies/Graphics/pull/3489/files#diff-6c94d0a95b0b8a7f4c1b81748cdbc112bd5e2c6196fce18beef39dd79b22cb9aR9 but it's better to clean the define after usage. * *Update changelog.md Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>

Adrian1066 added 18 commits January 21, 2021 10:51

GameCore support for Core pipelines

04ce5f9

GameCore support for PostProcessing

2c2c217

GameCore support for HDRP

47a1e83

Instancing and stencil fix

064fa6e

Disable scalar optimization

118273c

Fixed typo

79f9022

Added XboxSeries pragmas to ShaderGraph

fcb489a

xboxseries pragma applied to shaders

3c3c869

xboxseries pragma applied to test shaders

4766dfc

Added missing XboxOneD3D12 device type

5c454b0

Updated documentation

9738651

PostProcess fix for earlier Unity builds

5d243cf

Shader functions must have return values

1f27935

Build target test case fixes

f5f3899

Workaround for noperspective on transparent vfx particles

9a47fb9

Revert "Updated documentation"

7f3c117

This reverts commit 9738651.

Updated documentation

bdbf063

Merge branch 'master' into platform/gamecore

a7cd024

Adrian1066 requested review from a team as code owners January 29, 2021 08:41

github-actions bot added HDRP Shader Graph SRP testing universal vfx labels Jan 29, 2021

Adrian1066 requested review from CharlieBeatnik and FrancescoC-unity January 29, 2021 08:42

sebastienlagarde added needs-backport-7.x needs-backport-10.x needs-backport-2021.1 labels Feb 17, 2021

Update CHANGELOG.md

220c522

sebastienlagarde reviewed Feb 17, 2021

View reviewed changes

Merge branch 'master' into platform/gamecore

45ba579

sebastienlagarde approved these changes Feb 17, 2021

View reviewed changes

Merge branch 'master' into platform/gamecore

18fedc9

esmelusina approved these changes Feb 17, 2021

View reviewed changes

sebastienlagarde and others added 6 commits February 17, 2021 19:51

Formatting

e94d7bc

Fixed type in RenderDBuffer

f225071

Merge branch 'master' into platform/gamecore

6b96693

Add various missing xboxseries

9ba07b7

Merge branch 'master' into platform/gamecore

34b12f4

Merge branch 'master' into platform/gamecore

4aeade3

sebastienlagarde merged commit a46b92f into master Feb 21, 2021

sebastienlagarde deleted the platform/gamecore branch February 21, 2021 21:22

PaulDemeulenaere added a commit that referenced this pull request Feb 24, 2021

Reapply change from #3292

f541d68

See https://github.com/Unity-Technologies/Graphics/pull/3292/files#diff-d6bea52c2291e8be1d7e94b7c2016caf6701b7f5993722f9dd082efcbe56d5ccR16

sebastienlagarde pushed a commit that referenced this pull request Feb 24, 2021

Platform/gamecore #3292

b99995c

sebastienlagarde added backported-10.x and removed needs-backport-10.x labels Feb 24, 2021

sebastienlagarde mentioned this pull request Feb 24, 2021

[10.x.x Backport] Add GameCore support #3647

Merged

sebastienlagarde added a commit that referenced this pull request Feb 25, 2021

Platform/gamecore #3292 (#3647)

72ccd87

Co-authored-by: Adrian1066 <44636759+Adrian1066@users.noreply.github.com>

sebastienlagarde added backported-2021.1 and removed needs-backport-2021.1 labels Mar 3, 2021

sebastienlagarde pushed a commit that referenced this pull request Mar 3, 2021

Platform/gamecore #3292

ba12ba6

sebastienlagarde added backported-7.x and removed needs-backport-7.x labels Mar 25, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Platform/gamecore #3292

Platform/gamecore #3292

Uh oh!

Adrian1066 commented Jan 29, 2021

Uh oh!

github-actions bot commented Jan 29, 2021

Uh oh!

sebastienlagarde Feb 17, 2021

Uh oh!

FrancescoC-unity Feb 17, 2021

Uh oh!

sebastienlagarde Feb 17, 2021

Uh oh!

sebastienlagarde Feb 17, 2021

Uh oh!

FrancescoC-unity Feb 17, 2021

Uh oh!

FrancescoC-unity Feb 17, 2021

Uh oh!

esmelusina left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Platform/gamecore #3292

Platform/gamecore #3292

Uh oh!

Conversation

Adrian1066 commented Jan 29, 2021

Please read the Contributing guide before making a PR.

Checklist for PR maker

Purpose of this PR

Testing status

Comments to reviewers

Uh oh!

github-actions bot commented Jan 29, 2021

Uh oh!

sebastienlagarde Feb 17, 2021

Choose a reason for hiding this comment

Uh oh!

FrancescoC-unity Feb 17, 2021

Choose a reason for hiding this comment

Uh oh!

sebastienlagarde Feb 17, 2021

Choose a reason for hiding this comment

Uh oh!

sebastienlagarde Feb 17, 2021

Choose a reason for hiding this comment

Uh oh!

FrancescoC-unity Feb 17, 2021

Choose a reason for hiding this comment

Uh oh!

FrancescoC-unity Feb 17, 2021

Choose a reason for hiding this comment

Uh oh!

esmelusina left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants