Skip to content

[10.x.x] Merge Hdrp/staging [Skip CI] #933

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 51 commits into from
Jun 18, 2020
Merged

[10.x.x] Merge Hdrp/staging [Skip CI] #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
8709afc
Adding purge of unused resources in render graph. (#872)
JulienIgnace-Unity Jun 15, 2020
7844a92
First round of auto-exposure docs updates (#858)
FrancescoC-unity Jun 15, 2020
6c31f92
Fix depth offset and transparent motion vector for unlit transparent …
sebastienlagarde Jun 15, 2020
a4e44a8
Fixed an exception occuring when a camera doesn't have an HDAdditiona…
anisunity Jun 15, 2020
eeb7e11
Fix Generates Include command issue with Physically Based Sky (#908)
sebastienlagarde Jun 15, 2020
d6526fb
Merge branch 'master' into HDRP/staging
sebastienlagarde Jun 15, 2020
f511b13
Fix ray tracing with XR single-pass (#891)
fabien-unity Jun 15, 2020
de2e24f
Hdrp/clean shader stacks fields (#906)
Jun 15, 2020
452cd6b
Pbr sky fixes metal (#911)
jessebarker Jun 15, 2020
4a1351d
Merge branch 'master' into HDRP/staging
sebastienlagarde Jun 15, 2020
7472b36
Cleaun shader config for shadow (#917)
sebastienlagarde Jun 16, 2020
ed8e2d5
Add comment for _IncludeIndirectLighting for emissive mesh and clean …
sebastienlagarde Jun 16, 2020
299f67b
Fix shader warning
sebastienlagarde Jun 16, 2020
1393d19
Fix shader config in DXR projects
sebastienlagarde Jun 16, 2020
ea1845c
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/…
sebastienlagarde Jun 16, 2020
e9bf513
Fix warnings (#920)
FrancescoC-unity Jun 16, 2020
fdadb28
Enable render graph test (#873)
sebastienlagarde Jun 16, 2020
48c4586
Add light layer on indirect lighting controller (#777)
EvgeniiG Jun 16, 2020
7ca236f
Update IndirectLightingController.cs
sebastienlagarde Jun 16, 2020
a46560b
Merge branch 'master' into HDRP/staging
sebastienlagarde Jun 16, 2020
94a6890
Compute shader stripping (#919)
FrancescoC-unity Jun 16, 2020
e05f272
Enable DXR automated tests for XR (#915)
fabien-unity Jun 16, 2020
d7da291
Change guards around ESRAM code (#922)
FrancescoC-unity Jun 16, 2020
f583b38
Bump min version (#923)
FrancescoC-unity Jun 16, 2020
2863016
Add a comment about packing float3/float4
sebastienlagarde Jun 16, 2020
9623020
Added Opaque Cull Mode option for materials and ShaderGraph (#918)
Jun 16, 2020
e9f00ab
Add test scene for SG vertex normal & tangent (#905)
remi-chapelain Jun 16, 2020
1351d3a
Updated the 2020.1 upgrade guide for custom pass volumes (#924)
Jun 16, 2020
b1b2851
HDRP Upgrade documentation for terrain new upgrade path (#901)
remi-chapelain Jun 16, 2020
f1812fa
Fix warning in HDAdditionalLightData OnValidate (#885)
pmavridis Jun 16, 2020
36ee24e
Merge branch 'master' into HDRP/staging
sebastienlagarde Jun 16, 2020
ba440a9
[10.x.x@ Update screenshots of test 8101 Opaque for HDRP test for Lin…
sebastienlagarde Jun 17, 2020
91006f0
Add the list of HDRP forbidden keywords in SG blackboard (#926)
Jun 17, 2020
ad1ad07
Add [MainColor] and [MainTexture] on property (#939)
sebastienlagarde Jun 17, 2020
eedfe69
Scene exposure override (#889)
FrancescoC-unity Jun 17, 2020
a219063
Exposure curve remapping can specify curves for min/max limits (#882)
FrancescoC-unity Jun 17, 2020
48ac51f
Merge branch 'master' into HDRP/staging
sebastienlagarde Jun 17, 2020
b43fcaf
IES Code path refactoring to support multiple SRP (#929)
skhiat Jun 17, 2020
284e8d4
Rename Compositor to Graphics Compositor (#950)
pmavridis Jun 17, 2020
09b6472
Ray traced reflection presets and fixes (#912)
anisunity Jun 17, 2020
44b385e
Fixed a warning in the ray tracing ambient occlusion compute shader. …
anisunity Jun 17, 2020
4f302fd
- Changed the way the filter size is decided for directional, point a…
anisunity Jun 17, 2020
eecd8cb
Various code cleanup in HDRP indirect diffuse lighting + Start remove…
sebastienlagarde Jun 17, 2020
42abf8a
Final Image Histogram Debug View (#887)
FrancescoC-unity Jun 17, 2020
44c8ac2
Cleanup area shadow code and Macro + remove more Raytracing macro (#945)
sebastienlagarde Jun 17, 2020
e420d62
Merge branch 'master' into HDRP/staging
sebastienlagarde Jun 17, 2020
11e5c55
HDRP: Fix shader warning in RaytracingAmbientOcclusion.compute
sebastienlagarde Jun 17, 2020
349e89a
HDRP: Fix standalone build (Break in Exposure scene settings PR)
sebastienlagarde Jun 17, 2020
b248663
HDRP: Update HDRenderPipeineResources.asset not up to date
sebastienlagarde Jun 17, 2020
d454b26
Cleanup HAVE_RECURSIVE_RENDERING usage (#958)
sebastienlagarde Jun 18, 2020
7ad7c61
Move Screen Space Shadow to multicompile and remove config requiremen…
sebastienlagarde Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...renceImages/Linear/WindowsEditor/Direct3D12/None/101_ReflectionsPerfFullRes.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.
4 changes: 2 additions & 2 deletions ...renceImages/Linear/WindowsEditor/Direct3D12/None/102_ReflectionsPerfHalfRes.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.
4 changes: 2 additions & 2 deletions ...eImages/Linear/WindowsEditor/Direct3D12/None/702_DirectionalShadowFiltering.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.
4 changes: 2 additions & 2 deletions ...enceImages/Linear/WindowsEditor/Direct3D12/None/702_PunctualShadowFiltering.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.
4 changes: 2 additions & 2 deletions ...enceImages/Linear/WindowsEditor/Direct3D12/None/901_Materials_HDRP_Variants.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.
4 changes: 2 additions & 2 deletions ...mages/Linear/WindowsEditor/Direct3D12/None/902_Materials_SG_Variants_Fabric.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.
4 changes: 2 additions & 2 deletions ...eImages/Linear/WindowsEditor/Direct3D12/None/902_Materials_SG_Variants_Hair.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.
4 changes: 2 additions & 2 deletions ...ceImages/Linear/WindowsEditor/Direct3D12/None/902_Materials_SG_Variants_Lit.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.
4 changes: 2 additions & 2 deletions ...ges/Linear/WindowsEditor/Direct3D12/None/902_Materials_SG_Variants_StackLit.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.
4 changes: 2 additions & 2 deletions ...Images/Linear/WindowsEditor/Direct3D12/None/902_Materials_SG_Variants_Unlit.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.
93 changes: 58 additions & 35 deletions ...rojects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/TransparentRTR.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,27 @@ MonoBehaviour:
hdriSky:
m_OverrideState: 1
m_Value: {fileID: 8900000, guid: 614ae0372d7dfb847a1926990e89fa06, type: 3}
enableDistortion:
m_OverrideState: 0
m_Value: 0
procedural:
m_OverrideState: 0
m_Value: 1
flowmap:
m_OverrideState: 0
m_Value: {fileID: 0}
upperHemisphereOnly:
m_OverrideState: 0
m_Value: 1
scrollDirection:
m_OverrideState: 0
m_Value: 0
min: 0
max: 360
scrollSpeed:
m_OverrideState: 0
m_Value: 2
min: 0
enableBackplate:
m_OverrideState: 0
m_Value: 0
Expand Down Expand Up @@ -201,16 +222,6 @@ MonoBehaviour:
rayTracing:
m_OverrideState: 1
m_Value: 1
minSmoothness:
m_OverrideState: 1
m_Value: 0
min: 0
max: 1
smoothnessFadeStart:
m_OverrideState: 0
m_Value: 0.9
min: 0
max: 1
reflectSky:
m_OverrideState: 0
m_Value: 1
Expand All @@ -229,33 +240,9 @@ MonoBehaviour:
m_Value:
serializedVersion: 2
m_Bits: 4294967295
rayLength:
m_OverrideState: 1
m_Value: 50
min: 0.001
max: 50
clampValue:
m_OverrideState: 0
m_Value: 1
min: 0.001
max: 10
denoise:
m_OverrideState: 1
m_Value: 0
denoiserRadius:
m_OverrideState: 0
m_Value: 8
min: 1
max: 32
mode:
m_OverrideState: 0
m_Value: 2
upscaleRadius:
m_OverrideState: 0
m_OverrideState: 1
m_Value: 2
fullResolution:
m_OverrideState: 0
m_Value: 0
sampleCount:
m_OverrideState: 0
m_Value: 1
Expand All @@ -266,6 +253,42 @@ MonoBehaviour:
m_Value: 1
min: 1
max: 31
m_MinSmoothness:
m_OverrideState: 1
m_Value: 0
min: 0
max: 1
m_SmoothnessFadeStart:
m_OverrideState: 0
m_Value: 0.9
min: 0
max: 1
m_RayMaxIterations:
m_OverrideState: 0
m_Value: 32
m_RayLength:
m_OverrideState: 1
m_Value: 50
min: 0.001
max: 50
m_ClampValue:
m_OverrideState: 0
m_Value: 1
min: 0.001
max: 10
m_UpscaleRadius:
m_OverrideState: 0
m_Value: 2
min: 2
max: 6
m_FullResolution:
m_OverrideState: 0
m_Value: 0
m_Denoise:
m_OverrideState: 1
m_Value: 0
m_DenoiserRadius:
m_OverrideState: 0
m_Value: 8
min: 1
max: 32
91 changes: 57 additions & 34 deletions ...cts/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsNoisy.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,27 @@ MonoBehaviour:
hdriSky:
m_OverrideState: 1
m_Value: {fileID: 8900000, guid: 5fb993a599e7e9b4b825e1a28e6d2c07, type: 3}
enableDistortion:
m_OverrideState: 0
m_Value: 0
procedural:
m_OverrideState: 0
m_Value: 1
flowmap:
m_OverrideState: 0
m_Value: {fileID: 0}
upperHemisphereOnly:
m_OverrideState: 0
m_Value: 1
scrollDirection:
m_OverrideState: 0
m_Value: 0
min: 0
max: 360
scrollSpeed:
m_OverrideState: 0
m_Value: 2
min: 0
enableBackplate:
m_OverrideState: 0
m_Value: 0
Expand Down Expand Up @@ -163,16 +184,6 @@ MonoBehaviour:
rayTracing:
m_OverrideState: 1
m_Value: 1
minSmoothness:
m_OverrideState: 1
m_Value: 0.5
min: 0
max: 1
smoothnessFadeStart:
m_OverrideState: 1
m_Value: 0.7
min: 0
max: 1
reflectSky:
m_OverrideState: 1
m_Value: 1
Expand All @@ -191,33 +202,9 @@ MonoBehaviour:
m_Value:
serializedVersion: 2
m_Bits: 4294967295
rayLength:
m_OverrideState: 1
m_Value: 50
min: 0.001
max: 50
clampValue:
m_OverrideState: 1
m_Value: 0.75
min: 0.001
max: 10
denoise:
m_OverrideState: 0
m_Value: 0
denoiserRadius:
m_OverrideState: 0
m_Value: 16
min: 1
max: 32
mode:
m_OverrideState: 1
m_Value: 2
upscaleRadius:
m_OverrideState: 0
m_Value: 4
fullResolution:
m_OverrideState: 0
m_Value: 0
sampleCount:
m_OverrideState: 0
m_Value: 1
Expand All @@ -228,6 +215,42 @@ MonoBehaviour:
m_Value: 1
min: 1
max: 31
m_MinSmoothness:
m_OverrideState: 1
m_Value: 0.5
min: 0
max: 1
m_SmoothnessFadeStart:
m_OverrideState: 1
m_Value: 0.7
min: 0
max: 1
m_RayMaxIterations:
m_OverrideState: 1
m_Value: 22
m_RayLength:
m_OverrideState: 1
m_Value: 50
min: 0.001
max: 50
m_ClampValue:
m_OverrideState: 1
m_Value: 0.75
min: 0.001
max: 10
m_UpscaleRadius:
m_OverrideState: 0
m_Value: 4
min: 2
max: 6
m_FullResolution:
m_OverrideState: 0
m_Value: 0
m_Denoise:
m_OverrideState: 1
m_Value: 0
m_DenoiserRadius:
m_OverrideState: 0
m_Value: 16
min: 1
max: 32
Loading