Skip to content

HDRP sub targets refactor (#773) #795

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 4 commits into from
Jun 10, 2020
Merged

HDRP sub targets refactor (#773) #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a108bed
HDRP sub targets refactor (#773)
alelievr Jun 9, 2020
c6d0849
Update HDShaderPasses.cs
sebastienlagarde Jun 9, 2020
a82372d
Update material for HDRP_Test
sebastienlagarde Jun 9, 2020
776b218
update DXR material
sebastienlagarde Jun 10, 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
  •  
  •  
  •  
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: 3
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -135,6 +135,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -135,6 +135,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -137,6 +137,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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 @@ -125,6 +125,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -264,4 +265,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 3
version: 4
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: 3
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -137,6 +137,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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 @@ -122,6 +122,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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: 3
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -135,6 +135,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down Expand Up @@ -135,6 +135,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 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 @@ -122,6 +122,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -261,4 +262,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -125,6 +125,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -264,4 +265,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -124,6 +124,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 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: 3
version: 4
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 @@ -122,6 +122,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -261,4 +262,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 3
version: 4
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 @@ -122,6 +122,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -261,4 +262,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 3
version: 4
4 changes: 3 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 @@ -122,6 +122,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -250,6 +251,7 @@ Material:
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
- _UnlitColor: {r: 1, g: 1, b: 1, a: 1}
- _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!114 &5321886580180689694
MonoBehaviour:
Expand All @@ -263,4 +265,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 3
version: 4
4 changes: 3 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 @@ -122,6 +122,7 @@ Material:
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
Expand Down Expand Up @@ -250,6 +251,7 @@ Material:
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
- _UnlitColor: {r: 1, g: 1, b: 1, a: 1}
- _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!114 &7474211021698448458
MonoBehaviour:
Expand All @@ -263,4 +265,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 3
version: 4
2 changes: 1 addition & 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: 3
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down
2 changes: 1 addition & 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: 3
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand Down
2 changes: 1 addition & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Transparent.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,4 +264,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 3
version: 4
Loading