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

Closed
wants to merge 66 commits into from
Closed

Update URP materials after the blend PR. #6133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
d7406d7
Blend Test, Unlit, Simple Lit blending.
eh-unity Sep 17, 2021
a5c9aee
Move alpha modulate to match "premultiplied" manual authoring.
eh-unity Sep 17, 2021
ed1c2f4
Reduce keywords.
eh-unity Sep 20, 2021
077b1b6
Lit blending fixes + clean up.
eh-unity Sep 20, 2021
d70b155
Shadergraph blending & preserve spec fixes.
eh-unity Sep 21, 2021
ba28483
Update test scene.
eh-unity Sep 21, 2021
d058838
Graph allow override test and fix.
eh-unity Sep 21, 2021
90932aa
Fix tests, update change log.
eh-unity Sep 22, 2021
b5c2636
Add blend test platform ref images.
eh-unity Sep 22, 2021
76b6993
Change multiply blend mode alpha to keep dst instead of multiply.
eh-unity Sep 23, 2021
676c2fc
Update change log.
eh-unity Sep 23, 2021
0ea68c1
Update Images.
eh-unity Sep 23, 2021
540a06a
Fix Lit graph Preserve Spec GUI.
eh-unity Sep 23, 2021
ab75fff
Update d3d ref images.
eh-unity Sep 23, 2021
49c9cf7
Hide "Preserve Spec" button when not available.
eh-unity Sep 24, 2021
acceb27
Use HDR for test output image.
eh-unity Sep 24, 2021
be28dfa
Reset ref images to match expectations for new test result settings.
eh-unity Sep 24, 2021
f220123
Move AlphaModulate into it's own function.
eh-unity Sep 24, 2021
afef527
Update ref pics.
eh-unity Sep 24, 2021
c52b07b
Refactor AlphaModulate for PBRForwardPass.
eh-unity Sep 27, 2021
9c08496
Add material upgrader for blend modes.
eh-unity Sep 28, 2021
6883152
Allow material upgrades for (overridable) shadergraph materials.
eh-unity Sep 30, 2021
07596eb
Fix blend specular graph UI.
eh-unity Oct 1, 2021
3054df0
Add upgrade path for UniversalLit graph target settings.
eh-unity Oct 1, 2021
d1fe0b0
Add updated materials.
eh-unity Oct 4, 2021
7cb6f85
Fix Preserve Spec for ParticleLit.
eh-unity Oct 4, 2021
08ab61f
Fix more manually updated materials.
eh-unity Oct 5, 2021
9bca6da
Review improvements.
eh-unity Oct 5, 2021
f58b30d
Improve upgrader comment.
eh-unity Oct 6, 2021
26a5dd4
Merge branch 'master' into universal/fix-premultiplied-alpha-resurrect
eh-unity Oct 6, 2021
a199a64
Merge branch 'master' into universal/fix-premultiplied-alpha-resurrect
eh-unity Oct 7, 2021
2421ed8
Switch the blending test to use the backbuffer.
eh-unity Oct 7, 2021
b41b273
Update ref images to match backbuffer rendering.
eh-unity Oct 8, 2021
ea05278
Disable XR compatibility due to minor test artifact causing either XR…
eh-unity Oct 8, 2021
74b0c67
ref pic.
eh-unity Oct 8, 2021
4be90f5
Bump wait frames so that indirect light gets baked on all platforms.
eh-unity Oct 8, 2021
40751cc
Revert "Disable XR compatibility due to minor test artifact causing e…
eh-unity Oct 8, 2021
f31820c
Clamp source textures, solid color background.
eh-unity Oct 8, 2021
dd2f93f
Unlit and BakedLit does not have specular. Remove _ALPHAPREMULTIPLY.
eh-unity Oct 8, 2021
9ec1dc9
Add unlit shader path for material postprocessor.
eh-unity Oct 8, 2021
1585d1c
Upgrade Unlit shadergraph blendmode.
eh-unity Oct 11, 2021
ef71e61
Upgrade only active subtarget to avoid inactive subtarget override.
eh-unity Oct 11, 2021
c1c542d
Update Unlit premultiplied .shadergraph.
eh-unity Oct 11, 2021
1cc4fb4
Adjust blending test threshold and images.
eh-unity Oct 11, 2021
4aa3740
Disable XR, adjust ref image to 1920x1080.
eh-unity Oct 12, 2021
ad8bb24
Merge branch 'master' into universal/fix-premultiplied-alpha-resurrect
eh-unity Oct 12, 2021
944c65d
Update 050_Shader_Graphs lighting settings and materials.
eh-unity Oct 12, 2021
cac862d
Update 050_Shader_Graphs images.
eh-unity Oct 12, 2021
8c6d7fa
Remove ref images from wrong folder.
eh-unity Oct 12, 2021
cbd3117
Update 066_Blending ref images.
eh-unity Oct 12, 2021
566f128
Merge branch 'master' into universal/fix-premultiplied-alpha-resurrect
eh-unity Oct 18, 2021
969172c
Update linux vulkan.
eh-unity Oct 19, 2021
48edd56
Add changelog for material upgrade.
eh-unity Oct 20, 2021
d40abe0
Disable 050_ShaderGraphs for Android and iOS.
eh-unity Oct 20, 2021
a3f0fcc
Upgraded Runtime/Materials/*.mat files.
eh-unity Oct 25, 2021
9aa8eda
Foundation CommonAssets/ *.mat files upgrade.
eh-unity Oct 25, 2021
d78b54b
Foundation Scenes/ .mat files upgrade.
eh-unity Oct 25, 2021
304844e
Foundation Scenes/ .renderTexture files upgrade.
eh-unity Oct 25, 2021
868ce5f
Lighting CommonAssets/ .mat upgrade.
eh-unity Oct 25, 2021
efddeea
Lighting EditMode Assets .mat files upgrade.
eh-unity Oct 25, 2021
6d82bb0
Lighting Scenes/ .mat files upgrade.
eh-unity Oct 25, 2021
c594be6
Lighting Scenes/ .renderTexture files upgrade.
eh-unity Oct 25, 2021
537ca7f
Terrain CommonAssets/ .mat files upgrade.
eh-unity Oct 25, 2021
9cd6c68
Terrain Scenes/ .mat files upgrade.
eh-unity Oct 25, 2021
ad0083d
PostProcessing CommonAssets/ .mat files upgrade.
eh-unity Oct 25, 2021
08ebb24
PostProcessing Scenes/ .mat files upgrade.
eh-unity Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 18 additions & 1 deletion TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/CeramicTiles.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -89,17 +89,33 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoat: 0
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
Expand All @@ -118,6 +134,7 @@ Material:
- _SpecSource: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
Expand Down
19 changes: 18 additions & 1 deletion ...ojects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Challenge-Brick.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,33 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoat: 0
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
Expand All @@ -105,6 +121,7 @@ Material:
- _SpecSource: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
Expand All @@ -127,4 +144,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
21 changes: 19 additions & 2 deletions TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand All @@ -25,7 +25,7 @@ Material:
m_ShaderKeywords: _ALPHATEST_ON _METALLICSPECGLOSSMAP _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
Expand Down Expand Up @@ -89,17 +89,33 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 1
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoat: 0
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 0
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
Expand All @@ -118,6 +134,7 @@ Material:
- _SpecSource: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
Expand Down
7 changes: 5 additions & 2 deletions ...jects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand All @@ -25,7 +25,7 @@ Material:
m_ShaderKeywords: _ALPHATEST_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
Expand Down Expand Up @@ -89,11 +89,13 @@ Material:
m_Floats:
- _AlphaClip: 1
- _Blend: 0
- _BlendOp: 0
- _BumpScale: 1
- _Cull: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
Expand All @@ -113,6 +115,7 @@ Material:
- _SpecSource: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
Expand Down
8 changes: 6 additions & 2 deletions ...ojects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/IndustrialGlass.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3050
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -93,6 +94,7 @@ Material:
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BlendModePreserveSpecular: 0
- _BumpScale: 1
- _ClearCoat: 0
- _ClearCoatMask: 0
Expand All @@ -102,6 +104,7 @@ Material:
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _DstBlendAlpha: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
Expand All @@ -120,6 +123,7 @@ Material:
- _SpecSource: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _SrcBlendAlpha: 1
- _Surface: 1
- _UVSec: 0
- _WorkflowMode: 1
Expand All @@ -142,4 +146,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
19 changes: 17 additions & 2 deletions TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Diffuse.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -69,15 +69,29 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossinessSource: 0
Expand All @@ -92,12 +106,13 @@ Material:
- _SpecSource: 0
- _SpecularHighlights: 0
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
4 changes: 2 additions & 2 deletions ...ts/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -123,7 +123,7 @@ Material:
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
Expand Down
4 changes: 2 additions & 2 deletions ...lGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -123,7 +123,7 @@ Material:
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _BaseColorAddSubDiff: {r: -1, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.45641106, g: 0.45641106, b: 0.45641106, a: 1}
Expand Down
10 changes: 7 additions & 3 deletions .../UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand All @@ -26,11 +26,12 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3050
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -86,11 +87,13 @@ Material:
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BlendModePreserveSpecular: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _DstBlendAlpha: 10
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossinessSource: 0
Expand All @@ -105,12 +108,13 @@ Material:
- _SpecSource: 0
- _SpecularHighlights: 0
- _SrcBlend: 5
- _SrcBlendAlpha: 1
- _Surface: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
Loading