Skip to content

Shader stacks fixes #1085

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

Merged
merged 16 commits into from
Jul 1, 2020
Merged

Shader stacks fixes #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1b5a096
Fixed the non-editable transparent writes motion vector and back then…
alelievr Jun 29, 2020
6dc7279
Fixed alpha to mask reset in the material UI
alelievr Jun 29, 2020
138f3a9
Updated changelog
alelievr Jun 29, 2020
f2d028a
Fixed show after post process being visible in Lit SG material UI
alelievr Jun 29, 2020
b232859
Fixed displacement mode not showing in the material UI
alelievr Jun 29, 2020
94acb0a
Bump material version on HDRPProjectSettings
alelievr Jun 29, 2020
8ec7f0c
Moved depth offset keyword to base unlit
alelievr Jun 30, 2020
e3b409a
Fixed material multi-selection at several places
alelievr Jun 30, 2020
03be46f
Moved common.hlsl and shaderpass.cs.hlsl before define block in shade…
alelievr Jun 30, 2020
e189c6f
Fixed depth offset displayed in material but disabled in SG
alelievr Jun 30, 2020
9f75d92
Merge branch 'HDRP/staging' into HDRP/fix/shader-stacks-fixes
sebastienlagarde Jun 30, 2020
16e7eda
Merge branch 'HDRP/staging' into HDRP/fix/shader-stacks-fixes
sebastienlagarde Jun 30, 2020
f8771cd
update HDRP test material
sebastienlagarde Jul 1, 2020
61c9db4
update DXR material
sebastienlagarde Jul 1, 2020
286a37c
Update 709_CameraExtendedCulling.png
sebastienlagarde Jul 1, 2020
007cd9e
Merge branch 'HDRP/staging' into HDRP/fix/shader-stacks-fixes-material
sebastienlagarde Jul 1, 2020
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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions ...erenceImages/Linear/WindowsEditor/Direct3D12/None/709_CameraExtendedCulling.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_GreyDiffuse.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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -136,6 +136,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RedDiffuse.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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -136,6 +136,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 1
Expand Down
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RoughTintedGlass.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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -138,6 +138,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_SoapBubble.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -266,4 +267,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_ThinTintedGlass.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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -138,6 +138,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_UnlitSG.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/box_gi.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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -136,6 +136,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/sphere_gi.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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -136,6 +136,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Ground.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -263,4 +264,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...rojects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_1.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...rojects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_2.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...rojects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_3.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...ects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_1.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...ects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_2.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...ects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_3.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_plane.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...DRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_sphere.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -266,4 +267,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...ojects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_1.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...ojects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_2.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion ...ojects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_3.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Material:
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -265,4 +266,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Lit.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -263,4 +264,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/MirrorLit.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -263,4 +264,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Unlit.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -266,4 +267,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog/RenderPlane.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -266,4 +267,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Background.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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -136,6 +136,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down
3 changes: 2 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Ground.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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -136,6 +136,7 @@ Material:
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down
Loading