Skip to content

[2022.1] Fix shadow rendering correctly to work with shader stripping in WebGl#6300

Merged
phi-lira merged 5 commits into
masterfrom
universal/fix-webgl-strip
Nov 24, 2021
Merged

[2022.1] Fix shadow rendering correctly to work with shader stripping in WebGl#6300
phi-lira merged 5 commits into
masterfrom
universal/fix-webgl-strip

Conversation

@lukaschod
Copy link
Copy Markdown
Contributor

@lukaschod lukaschod commented Nov 16, 2021 •
edited
Loading

Purpose of this PR

Fix for case https://fogbugz.unity3d.com/f/cases/1381881/.

Testing status

Tested if it fixes bug case.

@lukaschod lukaschod requested a review from a team as a code owner November 16, 2021 10:41
@lukaschod lukaschod requested a review from a team November 16, 2021 10:41
@lukaschod lukaschod changed the base branch from master to universal/staging November 16, 2021 10:41
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Nov 16, 2021

Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
Link to Yamato: https://unity-ci.cds.internal.unity3d.com/project/902/
Search for your PR branch using the search bar at the top, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)

URP
/jobDefinition/.yamato%252Fall-urp.yml%2523PR_URP_trunk
With changes to URP packages, you should also run
/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_trunk

Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Nov 16, 2021

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

phi-lira
phi-lira reviewed Nov 18, 2021
View reviewed changes
Comment thread com.unity.render-pipelines.universal/Runtime/Passes/AdditionalLightsShadowCasterPass.cs Outdated
{
CommandBuffer cmd = CommandBufferPool.Get();
CoreUtils.SetKeyword(cmd, ShaderKeywordStrings.AdditionalLightShadows, true);
cmd.SetGlobalTexture(m_AdditionalLightsShadowmap.id, m_AdditionalLightsShadowmapTexture);
Copy link
Copy Markdown
Contributor

@phi-lira phi-lira Nov 18, 2021

Choose a reason for hiding this comment

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

I supposed this might be obsolete with RTHandles PR? can you check?

Copy link
Copy Markdown
Contributor Author

@lukaschod lukaschod Nov 19, 2021

Choose a reason for hiding this comment

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

I will check, but in any case I think we need to land this regardless the rt handles

@lukaschod lukaschod changed the title Setting valid shadow texture even if it is not sampled. As GL expects… [2022.1] Setting valid shadow texture even if it is not sampled Nov 19, 2021
@lukaschod lukaschod changed the title [2022.1] Setting valid shadow texture even if it is not sampled [2022.2] Setting valid shadow texture even if it is not sampled Nov 19, 2021
@lukaschod lukaschod changed the title [2022.2] Setting valid shadow texture even if it is not sampled [2022.1] Setting valid shadow texture even if it is not sampled Nov 19, 2021
@lukaschod lukaschod changed the title [2022.1] Setting valid shadow texture even if it is not sampled [2022.1] Fix shadow rendering correctly to work with shader stripping in WebGl Nov 19, 2021
@lukaschod lukaschod mentioned this pull request Nov 19, 2021
Merged
@lukaschod
Merge branch 'master' of github.com:Unity-Technologies/Graphics into …
badb4da 
…universal/fix-webgl-strip

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
@lukaschod lukaschod requested a review from a team as a code owner November 22, 2021 11:42
@lukaschod lukaschod changed the base branch from universal/staging to master November 22, 2021 11:42
@theopnv theopnv removed the request for review from a team November 23, 2021 08:51
@lukaschod
Copy link
Copy Markdown
Contributor Author

lukaschod commented Nov 24, 2021

Build URP_2D on iPhone_Metal_il2cpp_Linear_Standalone_build_Player on version trunk
Instability

URP_Foundation on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041389
Same 8 tests fails on base

URP_Foundation on Linux_Vulkan_Standalone_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041387
Same 1 tests fails on base

URP_Foundation on OSX_Metal_playmode_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041394
System.TimeoutException

URP_Foundation on Win_DX11_Standalone_XR_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041377

URP_Foundation on Win_DX11_playmode_XR_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041378

URP_Foundation on Win_DX12_Standalone_XR_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041383

URP_Foundation on Win_Vulkan_Standalone_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041385

URP_Foundation on iPhone_Metal_Standalone_il2cpp_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041393

URP_Lighting on OSX_Metal_playmode_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041415
System.TimeoutException

URP_PostPro on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041454
146_MSAA_RenderToBackbuffer

URP_PostPro on Android_Vulkan_Standalone_il2cpp_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041456
079_GradingColorAdjustmentsLDR

URP_PostPro on OSX_Metal_playmode_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041459
System.TimeoutException

URP_Terrain on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041433
decal

URP_Terrain on Linux_Vulkan_Standalone_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041431
decal

URP_Terrain on OSX_Metal_playmode_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041436
System.TimeoutException

URP_Terrain on Win_Vulkan_Standalone_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/10041429
decal

Universal_Stereo on Win__Standalone_mono_Linear on version trunk
https://unity-ci.cds.internal.unity3d.com/job/9968110
126_SampleDepth

No new failures found, added links to same failures in master.

@phi-lira
Copy link
Copy Markdown
Contributor

phi-lira commented Nov 24, 2021

Merging straight to master as this is fix for shipstopper. I see the backport PR had QA on it.

@phi-lira phi-lira merged commit fa39769 into master Nov 24, 2021
@phi-lira phi-lira deleted the universal/fix-webgl-strip branch November 24, 2021 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

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

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

universal

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@lukaschod @phi-lira