Skip to content

Update URP materials after the blend PR. #6133

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 66 commits into from
Closed

Update URP materials after the blend PR. #6133

wants to merge 66 commits into from

Conversation

eh-unity
Copy link
Contributor

Purpose of this PR

Update URP materials assets after Blending PR has landed.

Testing status

N/A

Comments to reviewers

The Blend PR should land before this, so that we can separate feature and upgraded assets.

@eh-unity
Blend Test, Unlit, Simple Lit blending.
d7406d7
@eh-unity
Move alpha modulate to match "premultiplied" manual authoring.
a5c9aee
@eh-unity
Reduce keywords.
ed1c2f4
@eh-unity
Lit blending fixes + clean up.
077b1b6
@eh-unity
Shadergraph blending & preserve spec fixes.
d70b155
@eh-unity
Update test scene.
ba28483
@eh-unity
Graph allow override test and fix.
d058838
@eh-unity
Fix tests, update change log.
90932aa
@eh-unity
Add blend test platform ref images.
b5c2636
@eh-unity
Change multiply blend mode alpha to keep dst instead of multiply.
76b6993 
* Change the Alpha blend property from ...BlendA to ...BlendAlpha to be more clear.
* Update ref images.
@eh-unity
Update change log.
676c2fc
@eh-unity
Update Images.
0ea68c1
@eh-unity
Fix Lit graph Preserve Spec GUI.
540a06a
@eh-unity
Update d3d ref images.
ab75fff
@eh-unity
Hide "Preserve Spec" button when not available.
49c9cf7 
* Shadergraph: Make sure alpha keywords are only set on transparent surfaces.
@eh-unity
Use HDR for test output image.
acceb27
@eh-unity
Reset ref images to match expectations for new test result settings.
be28dfa
@eh-unity
Move AlphaModulate into it's own function.
f220123
@eh-unity
Update ref pics.
afef527
@eh-unity
Refactor AlphaModulate for PBRForwardPass.
c52b07b
@eh-unity
Add material upgrader for blend modes.
9c08496
@eh-unity
Allow material upgrades for (overridable) shadergraph materials.
6883152
@eh-unity
Fix blend specular graph UI.
07596eb
@eh-unity
Add upgrade path for UniversalLit graph target settings.
3054df0
@eh-unity
Add updated materials.
d1fe0b0
@eh-unity
Fix Preserve Spec for ParticleLit.
7cb6f85 
* Fix double multiplying of alpha for Particle shaders.
* Separate AlphaModulate and AlphaPremultiply in Particle Lit code.
* Move separated AlphaModulate and AlphaPremultiply into URP core.
* Remove ApplyAlphaModulate as it's now not needed.
@eh-unity
Fix more manually updated materials.
08ab61f
@eh-unity
Review improvements.
9bca6da
@eh-unity
Improve upgrader comment.
f58b30d
@eh-unity
Merge branch 'master' into universal/fix-premultiplied-alpha-resurrect
26a5dd4 
# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
eh-unity added 21 commits October 12, 2021 15:34
@eh-unity
Merge branch 'master' into universal/fix-premultiplied-alpha-resurrect
ad8bb24 
# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
@eh-unity
Update 050_Shader_Graphs lighting settings and materials.
944c65d
@eh-unity
Update 050_Shader_Graphs images.
cac862d
@eh-unity
Remove ref images from wrong folder.
8c6d7fa
@eh-unity
Update 066_Blending ref images.
cbd3117
@eh-unity
Merge branch 'master' into universal/fix-premultiplied-alpha-resurrect
566f128 
# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
@eh-unity
Update linux vulkan.
969172c
@eh-unity
Add changelog for material upgrade.
48edd56
@eh-unity
Disable 050_ShaderGraphs for Android and iOS.
d40abe0
@eh-unity
Upgraded Runtime/Materials/*.mat files.
a3f0fcc
@eh-unity
Foundation CommonAssets/ *.mat files upgrade.
9aa8eda
@eh-unity
Foundation Scenes/ .mat files upgrade.
d78b54b
@eh-unity
Foundation Scenes/ .renderTexture files upgrade.
304844e
@eh-unity
Lighting CommonAssets/ .mat upgrade.
868ce5f
@eh-unity
Lighting EditMode Assets .mat files upgrade.
efddeea
@eh-unity
Lighting Scenes/ .mat files upgrade.
6d82bb0
@eh-unity
Lighting Scenes/ .renderTexture files upgrade.
c594be6
@eh-unity
Terrain CommonAssets/ .mat files upgrade.
537ca7f
@eh-unity
Terrain Scenes/ .mat files upgrade.
9cd6c68
@eh-unity
PostProcessing CommonAssets/ .mat files upgrade.
ad0083d
@eh-unity
PostProcessing Scenes/ .mat files upgrade.
08ebb24
@github-actions
Copy link

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

Shader Graph
/jobDefinition/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_trunk
Depending on your PR, you may also want
/jobDefinition/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_trunk
/jobDefinition/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_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.

@phi-lira phi-lira marked this pull request as ready for review October 26, 2021 15:32
@phi-lira phi-lira requested review from a team as code owners October 26, 2021 15:32
@phi-lira
Copy link
Contributor

Merged in second iteration #6326

@phi-lira phi-lira closed this Nov 18, 2021
@phi-lira phi-lira deleted the universal/fix-premultiplied-alpha-resurrect-material-upgrade branch November 18, 2021 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
universal
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@eh-unity @phi-lira @sebastienlagarde