iframe-proxy

vincent-breysse · 2021-12-01T19:21:19Z

/!\ Most of the changes are test related

Purpose of this PR

URP changes only

Merge FallbackError.shader and MaterialError.shader. These shaders were originally split to have a DOTS compatible error shader while still having a shader being compatible with built-in RP.
However this PR tries to simplify this by having only one shader with two sub shaders and use the Tags { "RenderPipeline" = "UniversalPipeline" } thingy

URP/HDRP changes

Add #pragma editor_sync_compilation to error/loading shaders to avoid the "error/loading shader is currently loading" edge case
Add DOTS compatible loading shader
Some [Reload("Path/To/Shader.shader")] additions/updates

These new shaders are needed by Hybrid Renderer since built-in error/loading shaders aren't DOTS compatible.

Testing status

- Manual testing

- URP/HDRP QA pass

- Added URP/HDRP scenes to test various error shader cases when rendering with a BRG (not automated) :

- Compilation error in HLSL code
- Compilation error in shader parser (different internal handling than an error in HLSL code)
- Shader with missing DOTS_INSTANCING_ON keyword
- Material with missing shader
- MeshRenderer with missing material
- MeshRenderer with null material
- Shader non SRP Batcher compatible
- Shader not supported
- Shader pass not supported (different internal handling than whole shader not being supported)

- Yamato PR URP/HDRP on trunk green except:

Failing on master as well:
- URP_Lighting on Win_Vulkan_Standalone_mono_Linear on version trunk
- HDRP on Win_DX11_playmode_mono_Linear on version trunk
- HDRP on Win_DX11_playmode_XR_mono_Linear on version trunk
- HDRP on Win_DX12_playmode_mono_Linear on version trunk
- HDRP on Win_Vulkan_playmode_mono_Linear on version trunk
- HDRP on OSX_Metal_playmode_mono_Linear on version trunk
- HDRP on Linux_Vulkan_playmode_mono_Linear on version trunk
- HDRP_DXR on Win_DX12_playmode_mono_Linear on version trunk

…= "HDRenderPipeline" }

…and Non SRP Batcher compatible cases

# Conflicts: # TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs # TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs # com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset

github-actions · 2021-12-01T19:21:33Z

…nfusions

sebastienlagarde

small comment otherwise good for hdrp section

TomasKiniulis

Tested BatchRendererGroup_HDRP, Amalienborg palace builds on Deferred and Forward with Game Objects and BRG. Looks good on HDRP side.

Test doc for more details: https://confluence.unity3d.com/pages/viewpage.action?pageId=172268208

cinight

All good. Test Doc: https://docs.google.com/document/d/1QAfxaWR3YDvCPR6pbvTniqassj1ETHdD-j94cfoUCVs/edit#

# Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md # com.unity.render-pipelines.universal/CHANGELOG.md # com.unity.render-pipelines.universal/Runtime/UniversalRendererData.cs

…hader")]

…nderData

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

# Conflicts: # TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs # TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs

phi-lira

LGTM.

Co-authored-by: Felipe Lira <felipedrl@gmail.com>

…Technologies/Graphics into graphics/brg-error-loading-shader

…the define when the C++ PR providing the APIs actually land

vincent-breysse added 11 commits November 16, 2021 12:08

Fix missing null checks in BRG test projects

373a7a9

Setup URP/HDRP test scenes + Add relevant shaders

0f979b9

Add missing #pragma editor_sync_compilation + Tags{ "RenderPipeline" …

1edd2bc

…= "HDRenderPipeline" }

Put HDRP loading shader under Hidden/

18c3a4c

Setup HDRP error material test scene

fcb987c

Fix "Shaders/Utils/MaterialError.shader" Reload errors

61468f4

Setup error material test scene

785d15d

Update error material test scene to cover missing DOTS_INSTANCING_ON …

850eed3

…and Non SRP Batcher compatible cases

Prepare merge with master

a0483d0

Re-add error material test scenes

0e9b061

github-actions Bot added HDRP testing universal labels Dec 1, 2021

vincent-breysse added 2 commits December 10, 2021 14:58

Remove unecessary diff

0a2eb95

Cleanup

99aa775

sebastienlagarde changed the title ~~BatchRendererGroup error/loading material support~~ [Draft] BatchRendererGroup error/loading material support Dec 14, 2021

vincent-breysse added 3 commits January 10, 2022 17:29

Merge branch 'master' into graphics/brg-error-loading-shader

f02e0e8

Update chaneglogs

2fd030b

Mute intentional shader errors for error material testing to avoid co…

754c9ec

…nfusions

vincent-breysse marked this pull request as ready for review January 10, 2022 18:40

vincent-breysse requested a review from a team as a code owner January 10, 2022 18:40

vincent-breysse requested a review from a team January 10, 2022 18:40

vincent-breysse removed the testing label Jan 10, 2022

github-actions Bot added the testing label Jan 10, 2022

vincent-breysse changed the title ~~[Draft] BatchRendererGroup error/loading material support~~ DOTS compatible error/loading shaders Jan 10, 2022

vincent-breysse requested review from JussiKnuuttila, phi-lira and sebastienlagarde January 10, 2022 18:41

sebastienlagarde approved these changes Jan 12, 2022

View reviewed changes

vincent-breysse added 2 commits January 12, 2022 17:24

Add comment

3e8fcb3

Add a checkbox to toggle error/loading material usage in test scenes

68781bb

vincent-breysse force-pushed the graphics/brg-error-loading-shader branch from 4a64c56 to 68781bb Compare January 12, 2022 19:18

Fix error/loading material not set correctly in player

afef3c6

TomasKiniulis approved these changes Jan 14, 2022

View reviewed changes

cinight approved these changes Jan 27, 2022

View reviewed changes

vincent-breysse added 4 commits February 1, 2022 12:25

Merge branch 'master' into graphics/brg-error-loading-shader

bb8b92a

# Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md # com.unity.render-pipelines.universal/CHANGELOG.md # com.unity.render-pipelines.universal/Runtime/UniversalRendererData.cs

Fix changelog mergeing + Add [Reload("Shaders/Utils/FallbackLoading.s…

1a1d40c

…hader")]

Add [Reload("Shaders/Utils/FallbackLoading.shader")] in URP ForwardRe…

2a99dff

…nderData

Fix changelog typo

c59155c

vincent-breysse changed the title ~~DOTS compatible error/loading shaders~~ DOTS compatible error/loading shaders GFXHYR-308 Feb 3, 2022

vincent-breysse and others added 4 commits February 3, 2022 14:33

GFXHYR-308

eda4556

Merge branch 'master' into graphics/brg-error-loading-shader

e70ee51

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

Disable all picking related code by default

b6fda3e

# Conflicts: # TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs # TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs

Merge branch 'master' into graphics/brg-error-loading-shader

2116f4d

phi-lira reviewed Feb 9, 2022

View reviewed changes

Comment thread com.unity.render-pipelines.universal/CHANGELOG.md Outdated

Update com.unity.render-pipelines.universal/CHANGELOG.md

43d7b7a

Co-authored-by: Felipe Lira <felipedrl@gmail.com>

phi-lira reviewed Feb 9, 2022

View reviewed changes

Comment thread com.unity.render-pipelines.universal/Shaders/Utils/FallbackLoading.shader Outdated

Comment thread com.unity.render-pipelines.universal/Shaders/Utils/FallbackError.shader

vincent-breysse added 2 commits February 9, 2022 18:26

URP side reviews

f1e2cf7

Merge branch 'graphics/brg-error-loading-shader' of github.com:Unity-…

0e757a0

…Technologies/Graphics into graphics/brg-error-loading-shader

phi-lira approved these changes Feb 10, 2022

View reviewed changes

vincent-breysse and others added 3 commits February 10, 2022 14:13

Fix potential formatting issue

3af38c3

Hide error/loading shader API call under a define for now. Uncomment …

aab1f23

…the define when the C++ PR providing the APIs actually land

Merge branch 'master' into graphics/brg-error-loading-shader

32e79b0

vincent-breysse merged commit 80faba9 into master Feb 14, 2022

vincent-breysse deleted the graphics/brg-error-loading-shader branch February 14, 2022 18:15

vincent-breysse restored the graphics/brg-error-loading-shader branch March 4, 2022 12:39

vincent-breysse deleted the graphics/brg-error-loading-shader branch March 4, 2022 12:46

vincent-breysse mentioned this pull request Mar 4, 2022

Fix MaterialError shader API break #7295

Merged

Sunbelt Computer Software

PL/B Language Development and Support

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

DOTS compatible error/loading shaders GFXHYR-308#6449

DOTS compatible error/loading shaders GFXHYR-308#6449
vincent-breysse merged 33 commits into
masterfrom
graphics/brg-error-loading-shader

vincent-breysse commented Dec 1, 2021 •

edited

Loading

Uh oh!

github-actions Bot commented Dec 1, 2021

Uh oh!

sebastienlagarde left a comment

Uh oh!

TomasKiniulis left a comment

Uh oh!

cinight left a comment

Uh oh!

phi-lira left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Conversation

vincent-breysse commented Dec 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

/!\ Most of the changes are test related

Purpose of this PR

URP changes only

URP/HDRP changes

Testing status

- Manual testing

- URP/HDRP QA pass

- Added URP/HDRP scenes to test various error shader cases when rendering with a BRG (not automated) :

- Yamato PR URP/HDRP on trunk green except:

Uh oh!

github-actions Bot commented Dec 1, 2021

Uh oh!

sebastienlagarde left a comment

Choose a reason for hiding this comment

Uh oh!

TomasKiniulis left a comment

Choose a reason for hiding this comment

Uh oh!

cinight left a comment

Choose a reason for hiding this comment

Uh oh!

phi-lira left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

vincent-breysse commented Dec 1, 2021 •

edited

Loading