Skip to content

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

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 45 commits into from
Jul 5, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 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
ec24987
Fix custom pass after post process buffer (#1072)
alelievr Jul 2, 2020
abae047
Fix glitch in Project settings window when selecting diffusion profil…
pmavridis Jul 2, 2020
5fc0186
Fix issue with light layers > 7 in the deferred path (#1054)
FrancescoC-unity Jul 2, 2020
c915267
Fix emissive mesh layer mask behaviour (#1062)
FrancescoC-unity Jul 2, 2020
134d491
Fixed an error when switch area light shape to disk while an emissive…
fredericv-unity3d Jul 3, 2020
7c36a04
[skip ci] fix pr978 (#981)
RemyUnity Jul 3, 2020
5fe61f8
Merge branch 'master' into HDRP/staging
sebastienlagarde Jul 3, 2020
bb067e0
Fixed the transparent SSR dependency not being properly disabled acco…
anisunity Jul 3, 2020
265d582
Fix SSAO with double sided material and normal mode to none (#1043)
FrancescoC-unity Jul 3, 2020
3d87cc6
Use the wide mode to force the UI drawing on a single line (1251235) …
fredericv-unity3d Jul 3, 2020
b4171d4
Implemented shadergraph upgrade system using system data (#1125)
alelievr Jul 3, 2020
3180e6c
Have the PBR Sky not render black when below horizon (#1116)
FrancescoC-unity Jul 3, 2020
995ca3d
Find the appropriate default frame settings per editor (case 1247631)…
fredericv-unity3d Jul 3, 2020
bee2058
Porting most of post processing to Render graph (#1038)
FrancescoC-unity Jul 4, 2020
f35cbbe
Fix an issue with the quality mode and perf mode on RTR and RTGI and …
anisunity Jul 4, 2020
35fc5ff
Fix unitialized ray tracing resources when project uses non-default H…
pmavridis Jul 4, 2020
4bb33d6
Workaround (#1073)
FrancescoC-unity Jul 4, 2020
99f6313
Fix for area light baked data not updating when changing the gizmo (#…
FrancescoC-unity Jul 4, 2020
11525d2
Fixed an issue with quality setting foldouts not opening when clickin…
anisunity Jul 4, 2020
fa2cc33
Fix rendertarget cookie spaceshipdemo (#1083)
skhiat Jul 4, 2020
a4756a4
fix sky asserts with XR multipass (#1133)
fabien-unity Jul 4, 2020
967116e
Merge branch 'master' into HDRP/staging
sebastienlagarde Jul 4, 2020
b499b7e
Revert: Fix for area light baked data not updating when changing the …
sebastienlagarde Jul 4, 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
26,819 changes: 0 additions & 26,819 deletions TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post.unity
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions ...ts/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Post.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,18 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Post
m_Shader: {fileID: -6465566751694194690, guid: 22df6d6a7eefbf94a88a3d890967341f,
m_Shader: {fileID: -6465566751694194690, guid: 3d493fa710ae74242b62906cd1061353,
type: 3}
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
_NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
_DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE
_SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
MotionVector: User
RenderType: Transparent
disabledShaderPasses:
- DistortionVectors
- MOTIONVECTORS
Expand Down Expand Up @@ -133,6 +135,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Boolean_a74aa7d30fed4055a2d61137d3a383a1: 0
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
Expand Down
5 changes: 4 additions & 1 deletion ...DRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre-Post.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ Material:
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
stringTagMap:
MotionVector: User
RenderType: Transparent
disabledShaderPasses:
- DistortionVectors
- MOTIONVECTORS
Expand Down Expand Up @@ -136,6 +138,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Boolean_a74aa7d30fed4055a2d61137d3a383a1: 1
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
Expand Down
8 changes: 5 additions & 3 deletions ...cts/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Pre
m_Shader: {fileID: -6465566751694194690, guid: 822db0e1fc84add4892efb880288c541,
m_Shader: {fileID: -6465566751694194690, guid: 3d493fa710ae74242b62906cd1061353,
type: 3}
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
_SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
_DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
MotionVector: User
RenderType: Transparent
disabledShaderPasses:
- DistortionVectors
- MOTIONVECTORS
Expand Down Expand Up @@ -133,6 +134,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Boolean_a74aa7d30fed4055a2d61137d3a383a1: 0
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
Expand Down
8 changes: 5 additions & 3 deletions ...cts/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Ref.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ref
m_Shader: {fileID: -6465566751694194690, guid: 8d46a59534670f44e81f11cea39f6db5,
m_Shader: {fileID: -6465566751694194690, guid: 3d493fa710ae74242b62906cd1061353,
type: 3}
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
_SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
_DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
MotionVector: User
RenderType: Transparent
disabledShaderPasses:
- DistortionVectors
- MOTIONVECTORS
Expand Down Expand Up @@ -134,6 +135,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Boolean_a74aa7d30fed4055a2d61137d3a383a1: 0
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
Expand Down
Loading