Skip to content

Merge Hdrp/staging #2109

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 17 commits into from
Oct 8, 2020
Merged

Merge Hdrp/staging #2109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
76fd85e
Fix warning in ShaderPassDecal.hlsl
sebastienlagarde Oct 5, 2020
b36a1d1
Merge branch 'master' into HDRP/staging
sebastienlagarde Oct 5, 2020
b641a23
Merge branch 'master' into HDRP/staging
sebastienlagarde Oct 6, 2020
4797023
Tooltip for microshadows (#2100)
adrien-de-tocqueville Oct 6, 2020
86bf44f
Update Alembic version to stop Alembic complaining
sebastienlagarde Oct 6, 2020
f81c104
Disable quad overdraw on ps4 (#2107)
adrien-de-tocqueville Oct 6, 2020
2642ef5
Enable the DXR Vertex Format test for RG (#2022)
anisunity Oct 6, 2020
3a7dae7
Add option to enable pure specular planar reflection (optimization) (…
sebastienlagarde Oct 7, 2020
0ce8be3
Implementing scalabity settings for planar resolutions (#2059)
anisunity Oct 7, 2020
6fb6d44
Merge branch 'master' into HDRP/staging
sebastienlagarde Oct 7, 2020
7630ad4
Remove useless SampleSkyTexture function
sebastienlagarde Oct 7, 2020
dbb1930
Fix errors when resizing the compositor's output and when removing/ad…
pmavridis Oct 7, 2020
d9549ad
Remove BLEND keywords and replace with constant branch (#1884)
FrancescoC-unity Oct 7, 2020
26d008e
Mixed cached shadow maps (Cached static + dynamic rendered every fram…
FrancescoC-unity Oct 7, 2020
ac18c33
Merge branch 'master' into HDRP/staging
sebastienlagarde Oct 7, 2020
98be585
update meta file with wrong information
sebastienlagarde Oct 7, 2020
15a8de4
Merge branch 'master' into HDRP/staging
sebastienlagarde Oct 8, 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
332 changes: 166 additions & 166 deletions TestProjects/HDRP_DXR_Tests/Assets/Scenes/6000_VertexFormats.unity
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion ...GraphicTests/Scenes/2x_Lighting/2208_And_2209_Reflection_Stencil/StencilShowShader.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ Shader "Custom/StencilShowShader"

// Keyword for transparent
#pragma shader_feature _SURFACE_TYPE_TRANSPARENT
#pragma shader_feature_local _ _BLENDMODE_ALPHA _BLENDMODE_ADD _BLENDMODE_PRE_MULTIPLY
#pragma shader_feature_local _ENABLE_FOG_ON_TRANSPARENT

//enable GPU instancing support
Expand Down
1 change: 0 additions & 1 deletion ...raphicTests/Scenes/2x_Lighting/2208_And_2209_Reflection_Stencil/StencilWriteShader.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ Shader "Custom/StencilWriteShader"

// Keyword for transparent
#pragma shader_feature _SURFACE_TYPE_TRANSPARENT
#pragma shader_feature_local _ _BLENDMODE_ALPHA _BLENDMODE_ADD _BLENDMODE_PRE_MULTIPLY
#pragma shader_feature_local _ENABLE_FOG_ON_TRANSPARENT

//enable GPU instancing support
Expand Down
8 changes: 8 additions & 0 deletions ...ojects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection.meta
View file
Open in desktop

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

Loading