Skip to content

Merge Hdrp/staging [skip CI] #1058

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 22 commits into from
Jul 1, 2020
Merged

Merge Hdrp/staging [skip CI] #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
deb10b5
Custom Passes for Render Graph (#1009)
JulienIgnace-Unity Jun 29, 2020
f7cae22
fix typo in the Render Pipeline Wizard (#1037)
fabien-unity Jun 29, 2020
343c886
Fixed a number of small issue when running XR and Render Graph at the…
JulienIgnace-Unity Jun 29, 2020
e820fd2
Renamed the debug name from SSAO to ScreenSpaceAmbientOcclusion (1254…
anisunity Jun 30, 2020
c0506e3
Added an example CloudLayer render texture + rotation for cloud layer…
adrien-de-tocqueville Jun 30, 2020
fe009c1
Fix perf framework ui (#1049)
alelievr Jun 30, 2020
f036923
Added an option to extend the camera culling for skinned mesh animati…
anisunity Jun 30, 2020
e0ddbe9
Change transparent ssr name in frame settings (#1056)
FrancescoC-unity Jun 30, 2020
8702b34
Move CloudLayer Material editor
adrien-de-tocqueville Jun 30, 2020
e54dbc7
Merge branch 'master' into HDRP/staging
sebastienlagarde Jun 30, 2020
287dda2
Correct fallback for ray tracing and light layers (1258837) (#1053)
anisunity Jul 1, 2020
f643e8a
Add missing tooltips in physical camera and improve the UI for apertu…
pmavridis Jul 1, 2020
8d46240
Fixed reseed on play overdraw vfx (#1050)
alelievr Jul 1, 2020
cce1fd7
Add defines guards around shadows hlsl files (#1067)
FrancescoC-unity Jul 1, 2020
5ed4159
Fix issue throwing exceptions when trying to do implicit conversions …
FrancescoC-unity Jul 1, 2020
16a0b14
Force scene view redraw upon change of override exposure (#1071)
FrancescoC-unity Jul 1, 2020
f21cd1a
Fixed an error when clearing the SSGI history texture at creation tim…
anisunity Jul 1, 2020
1c1df9b
Slight change of parametrization behaviour (#1080)
FrancescoC-unity Jul 1, 2020
2a067d8
Shader stacks fixes (#1085)
sebastienlagarde Jul 1, 2020
70b71bc
Merge branch 'master' into HDRP/staging
sebastienlagarde Jul 1, 2020
94ce797
Revert: Correct fallback for ray tracing and light layers (1258837) (…
sebastienlagarde Jul 1, 2020
e7b138d
Fixed Look Dev with Light Theme (#1006)
JulienIgnace-Unity 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
  •  
  •  
  •  
3 changes: 3 additions & 0 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.
96 changes: 96 additions & 0 deletions ...s/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/709_CameraExtendedCulling.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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
Loading