Skip to content

Commit a9d7146

Browse files
sebastienlagardekechogmitrano-unityanisunityjohnpars
authored
[HDRP][Backport 21.2] Backport various PRs (#6231)
* Increasing HDRP fined pruned light tile count to 63. #5771 * Fix Upscaled Film Grain & Dither in HDRP (#6111) When using particular types of upscaling, (CAS, FSR, Catmull) the film grain quality produced by HDRP was lower than expected. This was caused by errors in the UV scale calculations for the grain texture. This change fixes the issue by modifying the scale calculations to use the final viewport size rather than the size of the current scaled/unscaled viewport. This works because film grain is always handled by "FinalPass" which always renders at final viewport size anyways. This change also fixes a few cases where the current resolution group would have been incorrect when CAS or FSR were being used as the upscaling method. * Update CHANGELOG.md * Fix regression that was introduced in a previous PR on the diffuse denoiser #6119 * Fix Light Loop Variant Warnings (1372256) #6135 * Bump the HDRP Template IET Framework Package Version #6134 * Update ray tracing and path tracing docs regarding custom interpolator limitations (#6126) * [HDRP] Disable DoF for orthographic cameras #6124 * update occlusion radius for directional light sample (#6154) Co-authored-by: Sean Puller <[email protected]> * Clean up Public API Documentation #6151 * Fix Sky override not taken into account #6127 * [Fogbugz # 1372245] Hdrp/drs fixing pyramid blur #6136 * Improved Area Light Support for Hair (#6157) * Initial commit MRP implementation * Barn door application * Add dominant marschner lobe direction skeleton * Finalize rect light MRP for marschner, handle forward + backward hemisphere scattering. * Force pathtracer to far-field in case users use geometry with bad normals. * com.unity.render-pipelines.high-definition/Runtime/Material/Hair/MultipleScattering/HairMultipleScattering.hlsl * Fix SH ringing for multiple scattering * Add trivial support for cookies * Add Kajiya support for area light approximation (non-LTC) * remove Line area light MRP for now * Remove area rect reference * Update area light hair test scene and reference images * Select cookie mip based on solid angle, rename some functions, temporarily add back rect ref * Remove the useless div-by-1 and add a comment to explain the removal of the divide by PI * Add a comment to further explain the normalization we do on the longitudinal distribution * Remove the ref once again * Update test images for metal and vulkan * Add a zero-div guard to silence compiler warning * Update CHANGELOG.md * [HDRP][Path Tracing] Exposed 3 methods related to path tracing and accumulation. #6197 * [HDRP] Fix infitnite material import loop materials #6185 * fixed typo: users -> uses (#6162) * Don't blur if nothing to blur (saves memory due to RG) (#6183) * Fix local fog volumes z axis calculation #6068 * fixed passive voice (#6092) * Fixed grammar errors * fixed passive voice in decal doc * Update Decal.md * Update Decal.md * Update Decal.md * AxF Raytracing: fix performance mode distillation that was broken and removed in #9d6db83478c213bc066e5f728d94b7faa6662543 (#6104) * Add scale parameter in eye shader #6132 * updated Override Fog page (#6200) * updated fog override screenshot * changed Depth Extent to Volumetric Fog Distance * Fix missing pragma (#6204) * [HDRP] Fix custom pass motion vector texture access #6205 * Fix typo in MipBias tooltip in HDRenderPipelineUI.Skin (#6210) * Replace gizmos FindObjectsOfType with list registrations to avoid constant slowdown in large scenes. Merged editor guards blocks. (#6168) * [HDRP] Fix APV tooltip for Geometry Distance Offset (#6150) * Update tooltip * Update ProbeVolumeUI.Skin.cs * Fixed the point distribution for the diffuse denoiser sometimes not being properly intialized. #6194 * Fixed the bad blending between the sun and the clouds (case 1373282). #6193 * Fix shadow mask fade and optimize it at same time (#6083) * [HDRP][Path Tracing] Minor fix for SSS when combined with fog (#6215) * Minor fix for SSS + fog. * Comments. * Update 1401_HairGraph_Area_Light.png * update screenshots Co-authored-by: Kleber Garcia <[email protected]> Co-authored-by: gmitrano-unity <[email protected]> Co-authored-by: anisunity <[email protected]> Co-authored-by: John Parsaie <[email protected]> Co-authored-by: Pavlos Mavridis <[email protected]> Co-authored-by: Sean Puller <[email protected]> Co-authored-by: Sean Puller <[email protected]> Co-authored-by: Adrien de Tocqueville <[email protected]> Co-authored-by: Emmanuel Turquin <[email protected]> Co-authored-by: Antoine Lelievre <[email protected]> Co-authored-by: emilybrown1 <[email protected]> Co-authored-by: FrancescoC-unity <[email protected]> Co-authored-by: RemyUnity <[email protected]> Co-authored-by: slunity <[email protected]> Co-authored-by: James-Burr-Unity <[email protected]> Co-authored-by: Torbjorn Laedre <[email protected]>
1 parent 15cc9e0 commit a9d7146

File tree

173 files changed

+12315
-1750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+12315
-1750
lines changed

TestProjects/HDRP_DXR_Tests/Assets/Samples/High Definition RP/MaterialSamples/Shadergraphs/SG_Eye.shadergraph

Lines changed: 1747 additions & 367 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity

Lines changed: 101 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,35 @@ MonoBehaviour:
978978
m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0}
979979
m_FieldOfView: 0
980980
m_Aspect: 0
981+
m_SHForNormalization:
982+
sh[ 0]: 0
983+
sh[ 1]: 0
984+
sh[ 2]: 0
985+
sh[ 3]: 0
986+
sh[ 4]: 0
987+
sh[ 5]: 0
988+
sh[ 6]: 0
989+
sh[ 7]: 0
990+
sh[ 8]: 0
991+
sh[ 9]: 0
992+
sh[10]: 0
993+
sh[11]: 0
994+
sh[12]: 0
995+
sh[13]: 0
996+
sh[14]: 0
997+
sh[15]: 0
998+
sh[16]: 0
999+
sh[17]: 0
1000+
sh[18]: 0
1001+
sh[19]: 0
1002+
sh[20]: 0
1003+
sh[21]: 0
1004+
sh[22]: 0
1005+
sh[23]: 0
1006+
sh[24]: 0
1007+
sh[25]: 0
1008+
sh[26]: 0
1009+
m_HasValidSHForNormalization: 0
9811010
m_HDProbeVersion: 3
9821011
m_ObsoleteInfiniteProjection: 1
9831012
m_ObsoleteInfluenceVolume:
@@ -1203,7 +1232,7 @@ MonoBehaviour:
12031232
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
12041233
m_Name:
12051234
m_EditorClassIdentifier:
1206-
isGlobal: 1
1235+
m_IsGlobal: 1
12071236
priority: 0
12081237
blendDistance: 0
12091238
weight: 1
@@ -1366,7 +1395,7 @@ MonoBehaviour:
13661395
invertFade: 0
13671396
distanceFadeStart: 10000
13681397
distanceFadeEnd: 10000
1369-
textureOffset: {x: -0, y: -0, z: 0}
1398+
textureOffset: {x: -0, y: -0, z: -0}
13701399
falloffMode: 0
13711400
m_Version: 2
13721401
--- !u!4 &289937389
@@ -1376,14 +1405,14 @@ Transform:
13761405
m_PrefabInstance: {fileID: 0}
13771406
m_PrefabAsset: {fileID: 0}
13781407
m_GameObject: {fileID: 289937387}
1379-
m_LocalRotation: {x: 0.38268322, y: -0, z: -0, w: 0.9238797}
1408+
m_LocalRotation: {x: 0.9238792, y: -0, z: -0, w: 0.38268423}
13801409
m_LocalPosition: {x: -9.65, y: 14.476662, z: -13.446383}
13811410
m_LocalScale: {x: 2.2014, y: 2.2013998, z: 1.5467696}
13821411
m_ConstrainProportionsScale: 0
13831412
m_Children: []
13841413
m_Father: {fileID: 1576122520}
13851414
m_RootOrder: 12
1386-
m_LocalEulerAnglesHint: {x: 45.000004, y: 0, z: 0}
1415+
m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0}
13871416
--- !u!1 &379148968
13881417
GameObject:
13891418
m_ObjectHideFlags: 0
@@ -2007,6 +2036,7 @@ Canvas:
20072036
m_OverridePixelPerfect: 0
20082037
m_SortingBucketNormalizedSize: 0
20092038
m_AdditionalShaderChannelsFlag: 0
2039+
m_UpdateRectTransformForStandalone: 0
20102040
m_SortingLayerID: 0
20112041
m_SortingOrder: 0
20122042
m_TargetDisplay: 0
@@ -3812,6 +3842,35 @@ MonoBehaviour:
38123842
m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0}
38133843
m_FieldOfView: 0
38143844
m_Aspect: 0
3845+
m_SHForNormalization:
3846+
sh[ 0]: 0
3847+
sh[ 1]: 0
3848+
sh[ 2]: 0
3849+
sh[ 3]: 0
3850+
sh[ 4]: 0
3851+
sh[ 5]: 0
3852+
sh[ 6]: 0
3853+
sh[ 7]: 0
3854+
sh[ 8]: 0
3855+
sh[ 9]: 0
3856+
sh[10]: 0
3857+
sh[11]: 0
3858+
sh[12]: 0
3859+
sh[13]: 0
3860+
sh[14]: 0
3861+
sh[15]: 0
3862+
sh[16]: 0
3863+
sh[17]: 0
3864+
sh[18]: 0
3865+
sh[19]: 0
3866+
sh[20]: 0
3867+
sh[21]: 0
3868+
sh[22]: 0
3869+
sh[23]: 0
3870+
sh[24]: 0
3871+
sh[25]: 0
3872+
sh[26]: 0
3873+
m_HasValidSHForNormalization: 0
38153874
m_HDProbeVersion: 3
38163875
m_ObsoleteInfiniteProjection: 1
38173876
m_ObsoleteInfluenceVolume:
@@ -4301,6 +4360,7 @@ MonoBehaviour:
43014360
taaAntiFlicker: 0.5
43024361
taaMotionVectorRejection: 0
43034362
taaAntiHistoryRinging: 0
4363+
taaBaseBlendFactor: 0.875
43044364
physicalParameters:
43054365
m_Iso: 200
43064366
m_ShutterSpeed: 0.05
@@ -5460,6 +5520,7 @@ MonoBehaviour:
54605520
taaAntiFlicker: 0.5
54615521
taaMotionVectorRejection: 0
54625522
taaAntiHistoryRinging: 0
5523+
taaBaseBlendFactor: 0.875
54635524
physicalParameters:
54645525
m_Iso: 200
54655526
m_ShutterSpeed: 0.005
@@ -5723,7 +5784,7 @@ MonoBehaviour:
57235784
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
57245785
m_Name:
57255786
m_EditorClassIdentifier:
5726-
isGlobal: 1
5787+
m_IsGlobal: 1
57275788
priority: 0
57285789
blendDistance: 0
57295790
weight: 1
@@ -6138,7 +6199,7 @@ LightingSettings:
61386199
m_PrefabInstance: {fileID: 0}
61396200
m_PrefabAsset: {fileID: 0}
61406201
m_Name:
6141-
serializedVersion: 3
6202+
serializedVersion: 5
61426203
m_GIWorkflowMode: 1
61436204
m_EnableBakedLightmaps: 1
61446205
m_EnableRealtimeLightmaps: 0
@@ -6151,7 +6212,7 @@ LightingSettings:
61516212
m_LightmapMaxSize: 1024
61526213
m_BakeResolution: 40
61536214
m_Padding: 2
6154-
m_TextureCompression: 1
6215+
m_LightmapCompression: 3
61556216
m_AO: 0
61566217
m_AOMaxDistance: 1
61576218
m_CompAOExponent: 1
@@ -6178,7 +6239,7 @@ LightingSettings:
61786239
m_LightProbeSampleCountMultiplier: 4
61796240
m_PVRBounces: 2
61806241
m_PVRMinBounces: 2
6181-
m_PVREnvironmentMIS: 1
6242+
m_PVREnvironmentImportanceSampling: 1
61826243
m_PVRFilteringMode: 1
61836244
m_PVRDenoiserTypeDirect: 1
61846245
m_PVRDenoiserTypeIndirect: 1
@@ -6192,6 +6253,7 @@ LightingSettings:
61926253
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
61936254
m_PVRFilteringAtrousPositionSigmaIndirect: 2
61946255
m_PVRFilteringAtrousPositionSigmaAO: 1
6256+
m_PVRTiledBaking: 0
61956257
--- !u!1 &1521259788
61966258
GameObject:
61976259
m_ObjectHideFlags: 0
@@ -7134,6 +7196,35 @@ MonoBehaviour:
71347196
m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0}
71357197
m_FieldOfView: 0
71367198
m_Aspect: 0
7199+
m_SHForNormalization:
7200+
sh[ 0]: 0
7201+
sh[ 1]: 0
7202+
sh[ 2]: 0
7203+
sh[ 3]: 0
7204+
sh[ 4]: 0
7205+
sh[ 5]: 0
7206+
sh[ 6]: 0
7207+
sh[ 7]: 0
7208+
sh[ 8]: 0
7209+
sh[ 9]: 0
7210+
sh[10]: 0
7211+
sh[11]: 0
7212+
sh[12]: 0
7213+
sh[13]: 0
7214+
sh[14]: 0
7215+
sh[15]: 0
7216+
sh[16]: 0
7217+
sh[17]: 0
7218+
sh[18]: 0
7219+
sh[19]: 0
7220+
sh[20]: 0
7221+
sh[21]: 0
7222+
sh[22]: 0
7223+
sh[23]: 0
7224+
sh[24]: 0
7225+
sh[25]: 0
7226+
sh[26]: 0
7227+
m_HasValidSHForNormalization: 0
71377228
m_HDProbeVersion: 3
71387229
m_ObsoleteInfiniteProjection: 1
71397230
m_ObsoleteInfluenceVolume:
@@ -7473,6 +7564,7 @@ MonoBehaviour:
74737564
taaAntiFlicker: 0.5
74747565
taaMotionVectorRejection: 0
74757566
taaAntiHistoryRinging: 0
7567+
taaBaseBlendFactor: 0.875
74767568
physicalParameters:
74777569
m_Iso: 200
74787570
m_ShutterSpeed: 0.005
@@ -7902,6 +7994,7 @@ Canvas:
79027994
m_OverridePixelPerfect: 0
79037995
m_SortingBucketNormalizedSize: 0
79047996
m_AdditionalShaderChannelsFlag: 0
7997+
m_UpdateRectTransformForStandalone: 0
79057998
m_SortingLayerID: 0
79067999
m_SortingOrder: 0
79078000
m_TargetDisplay: 0
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:84763e5e47e074260e57ad4e7809a14d3e2af92993153bf45d8975134545174c
3+
size 55472

TestProjects/HDRP_Tests/Assets/GraphicTests/Common/3DObjects/HumanEyeModelScaled.fbx.meta

Lines changed: 109 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)