3a51c9b2
[HDCameraEditor] Refactored UI Framework
7 年前
6c10f301
[HDRenderPipelineEditor] Fixed light loop settings
7 年前
9a3378ab
Merge pull request #754 from Unity-Technologies/feature/HDRenderPipelineEditor
HDRenderPipelineEditor
7 年前
b8684ef4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
814bb007
Decouple SSS and Transmission option
Rename EnableSSSAndTransmission as EnableSubsurfaceScattering and
EnableTransmission
Note: Disabling Transmission doesn't save the ALU if it is enabled in
the profile
+ Add supportSubsurfaceScattering in UI
+ Small cosmetic rearrangement at the beginning of lit.hlsl
7 年前
eb916f23
More draft
7 年前
afc49b99
Merge pull request #759 from Unity-Technologies/Decouple-SSS-and-transmission-option
Decouple SSS and Transmission option
7 年前
f2d69eb4
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/FrameSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedFrameSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScattering.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/FrameSettings.cs
7 年前
a481f7fa
[HDRenderPipelineEditor] Updated HDRenderPIpelineInspector
7 年前
1456d06a
[HDRenderPipelineEditor] Added missing field and field renaming
7 年前
df79ad0d
Merge pull request #760 from Unity-Technologies/feature/HDRenderPipelineEditor
HDRenderPipelineInspector
7 年前
45993046
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
7e74580b
Merge branch 'master'
7 年前
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
1d4bba47
[PlanarReflection]Update UI
7 年前
bc32f1eb
[PlanarReflection] Added planar reflection cache (wip)
7 年前
6611be52
[PlanarReflection] Update planar sampling
7 年前
93c49e08
- Switched sample count to a uniform to be changed by users
- Cleaned UI
- Added a variation to disable contact shadows
7 年前
5c7e1fd0
Merge pull request #809 from Unity-Technologies/Branch_ScreenSpaceShadows
Contact Shadows
7 年前
128f5158
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
ca10cd2f
Merge
7 年前
03e54099
(WIP) Changed all HDRP RenderTextures to RTHandles
7 年前
c51ce48c
Merged master
7 年前
9a41a6d7
[PlanarReflections] Small fixes
7 年前
0e6b2e32
more improvement on framesettings and asset
- Suppres support async compute
- Add dirty state to asset render pipeline for frame settings
7 年前
376bd45a
Merge pull request #839 from Unity-Technologies/Fix-issue-with-camera-frame-settings
Fix issue with camera frame settings
7 年前
c032196d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
b32a2d17
Merge remote-tracking branch 'refs/remotes/origin/master' into HDRP_GraphicTests
7 年前
75799cbf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
7 年前
c3c7eec1
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity
7 年前
a5003db5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/PlanarReflection
7 年前
1d94ca60
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow
7 年前
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
19029ddd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
7 年前
d6ce9c49
[PlanarReflection] Several fixes
7 年前
84e022c3
Merge pull request #834 from Unity-Technologies/feature/PlanarReflection
Planar Reflection - #1 Use case Mirror
7 年前
2bae089c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
7 年前
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
fe0284c8
Merge branch 'master' into HDRP_GraphicTests
7 年前
6feb2d00
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
19876ed2
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
0bfdddfc
Merge Screen Shadows
7 年前
afca789b
intermediate commit, decal global properties and draw/fade distance
7 年前
950b560d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
bac44977
Post merge fixes
7 年前
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
6157d668
Merge pull request #896 from Unity-Technologies/decals/distance_culling
Decals/distance culling
7 年前
18cd3660
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-Menu-location-and-label
7 年前
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
6 年前
dd1d4224
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
6 年前
85039c4d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugFullScreen.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
6 年前
11c6aed3
Add MSAA sample count support thru RenderPipelineSettings
RenderPipelineSettings owns the global MSAA sample count level. Each camera can control whether MSAA is supported or not, and if the camera's FrameSettings enable MSAA, then it will use the RenderPipelineSettings value for MSAA sample count.
6 年前
401bf040
Merge pull request #900 from Unity-Technologies/hdrp-msaa-ui
Add MSAA sample count support thru RenderPipelineSettings
6 年前
f8cb8a66
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
44eb9802
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
6 年前
950e29d3
Merge remote-tracking branch 'origin/master' into build/automation
6 年前
2c282969
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/FrameSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
6 年前
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
a640342d
Remove 's' in SupportsXXX
6 年前
0bbd55c7
Don't display EnableFPTL in UI
6 年前
71d0fd3a
Rename MSAAAntiAliasing to MSAA as AA is for antialiasing already
6 年前
edd34849
Merge branch 'Branch_RTRefactoring' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
6 年前
a6688080
Merge pull request #878 from Unity-Technologies/Branch_RTRefactoring
Refactoring of HDRP render texture usage using RTHandles
6 年前
78ba9e5b
Merge master
6 年前
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
0aed191f
[UI] Removed animation on foldouts
6 年前
249256e5
Merge pull request #923 from Unity-Technologies/fix/RemoveAnimationFoldouts
[UI] Removed animation on foldouts
6 年前
5197454b
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity
6 年前
44fabb65
Merge branch 'master' into hdrp-xr-initial
6 年前
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
6 年前
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
6 年前
301dbf72
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
6 年前
5e5e46c8
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
6 年前
619cd52e
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
6 年前
35560656
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
75b17fab
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/Decal.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/DecalUtilities.hlsl
6 年前
070349c8
Merge branch 'master'
6 年前
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
6 年前
daae5ce2
(wip) Reflection system for reflection probes
6 年前
3367a6e0
Removed animated fade groups
6 年前
f31e3dc9
Merge pull request #945 from Unity-Technologies/fix/RemoveAnimatedFadeGroups
Removed animated fade groups
6 年前
44c4a197
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
6 年前
e768893e
Merge branch 'master'
6 年前
d56ea57d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
6 年前
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
6 年前
518ddfa0
Add an option to oversample SSS in the settings
6 年前
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
e5ba3df3
RenameSpotCookieSize to CookieSize
6 年前
d71819ce
Merge pull request #960 from Unity-Technologies/Rename-SpotCookieSize-to-CookieSize
Rename SpotCookieSize to CookieSize
6 年前
a48dc895
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-support-of-Camera-Clear-Flags
6 年前
2d5b988d
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
6 年前
04b933d9
merged with master
6 年前
e347d974
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
6 年前
44dd9f42
Merge branch 'master' into debug-menu-refactor
6 年前
2d48e00b
Merge branch 'master'
6 年前
e315e2a7
Merge pull request #972 from EvgeniiG/improve_sss
Improve the quality of Disney SSS
6 年前
3ad3c7d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
4b17c74c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling
# Conflicts:
# SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_10_5.mat
# SampleScenes/HDTest/Prefabs/Block_0.3x6.prefab
# SampleScenes/HDTest/Prefabs/Block_10x0.15.prefab
# SampleScenes/HDTest/Prefabs/Block_10x5.prefab
# SampleScenes/HDTest/Prefabs/Block_1x1.prefab
# SampleScenes/HDTest/Prefabs/Block_50x300.prefab
# ScriptableRenderPipeline/Core/CoreRP/Camera/CameraSwitcher.cs
6 年前
6f2b52f2
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
Manual fixup of some LightLoop stuff (stereo + decals living together in light cull data)
6 年前
2001df3c
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
6 年前
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
6 年前
8cc0d941
Merge SRP 2018.1
6 年前
ceaafcae
Rename the "Enable Ultra Quality SSS" option
6 年前
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
6 年前
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
6 年前
bcc645de
Fixed various issues with debug window
- Fixed Shadow Atlas index.
- Fixed DebugManager.instance.displayRuntimeUI breaking after domain reload
- Removed wrong "Last" entries in material debug.
- Fixed Frame Settings debug not being removed correctly on camera disable.
- Frame Settings debug layout is now the same as the regular UI.
6 年前
34c25f1b
Merge branch 'master' into LowEndPerf
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
6 年前
5007f081
Fixed various issues with debug window
- Fixed Shadow Atlas index.
- Fixed DebugManager.instance.displayRuntimeUI breaking after domain reload
- Removed wrong "Last" entries in material debug.
- Fixed Frame Settings debug not being removed correctly on camera disable.
- Frame Settings debug layout is now the same as the regular UI.
6 年前
b0109a5e
Merge pull request #1044 from Unity-Technologies/Branch_DebugWindowFixes
Various Debug Window fixes
6 年前
35d83109
Commented out Single pass lighting to decrease shader compilation time.
6 年前
e630eecd
Merge branch 'master' into LW-Bugfix
6 年前
0d28adac
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materials now always have a depth prepass.
6 年前
40539650
Merge branch '2018.1' into projects/TheLastStand
6 年前
4c9ec94f
Commented out Single pass lighting to decrease shader compilation time.
6 年前
47a2960a
Merge branch 'master' into LW-Bugfix
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
6 年前
dce1ca66
Merge pull request #1064 from Unity-Technologies/Branch_RemoveSinglePassLighting
Commented out Single pass lighting to decrease shader compilation time.
6 年前
f00d20a6
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materials now always have a depth prepass.
6 年前
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
6 年前
720c8a19
Merge branch 'master'
6 年前
bd98e302
Merge pull request #1067 from Unity-Technologies/Branch_RemoveGBufferWithPrepass
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materi…
6 年前
dd8b51a8
Merge branch 'master'
6 年前
73467192
Merge branch '2018.1' into projects/TheLastStand
6 年前
d1dfdb4e
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# SampleScenes/HDTest/PlanarReflectionTests.unity
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebugPanel.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
6 年前
c2126e91
Added bruteforce screen space tracing
6 年前
5ab7101f
Moved algorithm selection to shader variant
6 年前
59d93b72
Fixed an issue where putting Sky Lighting Override mask to "Everything" would cause the scene view background not to be cleared anymore
- Now clearing background only test the validity of the "Visual Sky" (instead of testing also the "Lighting Sky")
- Added a warning if "Everything" is set as a Sky Lighting Override Mask
- Changed the behavior of SceneView wrt to Volume layer mask. Now it uses the mask of the "main camera" if it exists, otherwise we use Everything minus Lighting Override Mask
6 年前
f25323ae
Merge pull request #1133 from Unity-Technologies/Branch_FixSkyOverrideIssue
Fixed an issue where putting Sky Lighting Override mask to "Everythin…
6 年前
76eb75c7
Merge branch 'master' into decals/texture_atlas
6 年前
75cf5fa5
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
6 年前
b987da15
Merge branch '2018.1' into projects/system-shock/2018.1
6 年前
c135df26
Added first version of shader variant stripper for Lit* shaders in HDRP.
6 年前
f52544f9
Allow edition of HDRP asset without a HDRP set in the graphic settings.
6 年前
7f1e837b
Merge pull request #1148 from Unity-Technologies/RemyUnity-patch-1
Allow edition of HDRP asset without a HDRP set in the graphic settings.
6 年前
5ad6a9db
Merge branch 'master' into StackLitWork
6 年前
16665d1f
Use HDRenderPipelineAsset for decal atlas dimensions, print an error when decal atlas allocation fails.
6 年前
a39254c9
Merge branch 'master' into feature/RefractionModes
6 年前
8d663ac4
Merge upstream/master
6 年前
5e4ad2d7
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
6 年前
65fc1c54
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted2.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader10.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader11.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader12.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader13.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader14.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader15.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader16.png.meta
# ScriptableRe...
6 年前
bc2cc021
Merge pull request #1178 from Unity-Technologies/decals/texture_atlas
Decals/texture atlas
6 年前
2e40eff7
Merge remote-tracking branch 'refs/remotes/origin/master' into stacklit
6 年前
b4708ef6
Merge upstream/master
6 年前
4bd00e90
Merge master
6 年前
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
31f3f3cb
Expose the number of light indices per clustered tile in the HDRenderpipelineAsset. This will allow for project specific changes.
6 年前
52d2cf4e
Merge pull request #1212 from Unity-Technologies/expose-numlights-per-cluster
Expose the number of light indices per clustered tile
6 年前
e53b33fe
Revert "Expose the number of light indices per clustered tile in the HDRenderpipelineAsset. This will allow for project specific changes."
This reverts commit 37c9fd844ae2cb461cb693ffc37dddcb71b2be3c.
6 年前
dc498b1e
Merge remote-tracking branch 'refs/remotes/origin/master' into Sharing-envlight-code
6 年前
7804b03a
Revert "Expose the number of light indices per clustered tile"
6 年前
7a36e4e2
Merge pull request #1215 from Unity-Technologies/revert-1212-expose-numlights-per-cluster
Revert "Expose the number of light indices per clustered tile"
6 年前
256e6c9c
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_HiZ.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Proxy.mat.meta
# Tests/GraphicsTests/RenderPip...
6 年前
d7990f7a
Merge pull request #1179 from Unity-Technologies/Branch_HDRPVariantStripping
Added first version of shader variant stripper for Lit* shaders in HDRP.
6 年前
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
e03580d8
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
6 年前
8676f2e5
Merge master
6 年前
533beaae
Merge branch 'master' into LWRP
6 年前
68db6753
Removed GlobalLightLoopSettings.maxPlanarReflectionProbe property
6 年前
f1636a3c
Merge pull request #1273 from Unity-Technologies/feature/MaxProbeLimit
Removed GlobalLightLoopSettings.maxPlanarReflectionProbe property
6 年前
0ddaf44e
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
6 年前
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
6 年前
10f8090a
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
6 年前
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
6 年前
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
6 年前
91dc696c
Merge upstream/master
6 年前
4bfaa623
merge master
6 年前
f9636448
Add volumetric bool
6 年前
17d5bb27
Merge pull request #1327 from Unity-Technologies/Add-FrameSettings-to-hdCamera
Add framesettings to hdcamera
6 年前
e0b3d217
Merge branch 'master' into stacklit
6 年前
f4660e9b
Add framesettings support to volumetric
6 年前
87b6bc50
Move atmospheric scattering field above volumetric
6 年前
1d661e75
Merge pull request #1334 from Unity-Technologies/Add-framesettings-support
Add enableVolumetric in the FrameSettings
6 年前
a2ee3145
Merge branch 'master' into stacklit
6 年前
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
6 年前
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
6 年前
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
6 年前
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
3932faa4
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/CHANGELOG.md
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCameraFrameHistoryType.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
6 年前
fafb59af
Run code formatter.
6 年前
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
6 年前
bba0731d
HDRP: Change settigs name from supportForwardOnly to supportOnlyForward
6 年前
012f4b1f
Merge pull request #1417 from Unity-Technologies/Change-name-of-supportOnlyForward
HDRP: Change settigs name from supportForwardOnly to supportOnlyForward
6 年前
49897966
HDRP: Reorganize folder and files
6 年前
aad9d81b
Merge pull request #1450 from Unity-Technologies/HDRP-Reorganize-folder-and-files
HDRP: Reorganize folder and files
6 年前
9f1637c0
Merge branch 'master' into decals/NoHDRP_exception
6 年前
d85052d9
Merge branch 'master' into StackLit2
6 年前
d7ff7340
Add debug display runtime shader variant stripping
6 年前
23e50c80
Rename SahderPreprocessorMaterial to BaseShaderPreprocessor
6 年前
e8ce5056
Merge branch 'master' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
6 年前
51a1873e
Merge branch 'master' into update-changelog
6 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
6 年前
1ea2f496
Merge pull request #1481 from Unity-Technologies/refactor-shader-variant-per-material
Refactor shader variant to allow stripping per material
6 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
6 年前
7933fd8d
Merge branch 'master' into StackLit2
6 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
6 年前
6c870111
Merge branch 'master' into FalseColorMode
6 年前
0098fb38
Updated changelog + missing file
6 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
6 年前
cec37252
Merge pull request #1513 from Unity-Technologies/Branch_FixReflectionVolumeUpdate
Fix for Light Loop UI and Volume interpolation for reflection
6 年前
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
6 年前
a49a696e
Merge branch 'master' into StackLit2
6 年前
9db2a137
Merge branch 'master' into HDRP-Tests
6 年前
ec4f2ed5
Add option to remove shader variant + update changelog to correct format
Add option to remove shader variant of LOD Cross fade (allow faster build)
Fix priority of Render Pipeline Debug Windows (Ux Team) Request
Update format of the Changelog
6 年前
159ea553
Merge pull request #1540 from Unity-Technologies/Add-option-to-remove-shader-variant-update-changelog-to-correct-format
Add option to remove shader variant + update changelog to correct format
6 年前
57fedd6c
Merge branch 'master' into HDRP-Tests
6 年前
25f5aa64
Merge branch 'master' into lw/lw-pipeline-asset-inspector
6 年前
d4992b3f
Merge branch 'master' into lw/camera-additional-data
6 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
c6fc1808
Added per channel blend selection mode for decals to render pipe asset
6 年前
f46075fb
Merge remote-tracking branch 'mainrepo/master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Lit/Lit.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
c08c9929
Expose shadow budget parameter in HDRP asset
6 年前
dc7e7036
Merge pull request #1586 from Unity-Technologies/ExposeShadowBudgetParameters
Expose shadow budget parameters
6 年前
fa92c52f
Merge branch 'master' into Improve-camera-relative-rendering
6 年前
a5e0fbca
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
6 年前
f5bd48cb
HDRP: Hide MSAA settings on HDRP Asset as it is not implemented
6 年前
34ae5a69
Merge branch 'master' into ios-texture-format
6 年前
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
6 年前
a452a9db
Merge branch 'master' into LightUnits
6 年前
6c2d5efb
Rename SSS quality levels
6 年前
f7ce098c
Add an option to the HDRP asset to increase the resolution of volumetric lighting
6 年前
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
51f228b4
Add an attribute to not break serizliation
6 年前
8dddca48
Merge pull request #1606 from EvgeniiG/kernel_quality_levels
Add an option to the HDRP asset to increase the resolution of volumetric lighting
6 年前
7934a87a
Merge branch 'master' into LightUnits
6 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
6 年前
40459f78
Change mask map channel selection to use check boxes
6 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
b4a3f127
Merge pull request #1674 from Unity-Technologies/decals/v2/per_channel_mask_new_ui
Decals/v2/per channel mask new ui
6 年前
49764db8
Update UI for decal material based on artists feedback + add upgrader script
6 年前
13ae3ef8
Merge pull request #1712 from Unity-Technologies/Update-DecalUI
Update UI for decal material based on artists feedback + add upgrader
6 年前
3f424739
Merge pull request #1713 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
c072c88e
fix wrong namespace editor classes
6 年前
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
13c603cb
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
4312d844
Merge pull request #1730 from Unity-Technologies/hdrp/fix-namespaces
Hdrp/fix namespaces
6 年前
07c127ac
Merge pull request #1743 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
b3ff809b
Merge branch 'master' into tests/hdrp/distortion
6 年前
f222f97c
Rename DBuffer -> Decals + Add decal multicompile option
- Rename DBuffer -> Decals
- Add multicompile for no decals at all (for support decals)
- TODO: Shader stripping
6 年前
b57e1824
Merge pull request #1747 from Unity-Technologies/Decal-compilation
Decal shader stripping and upgrade script + fix
6 年前
449e311f
Merge pull request #1749 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
80d748f5
Add light linking support ( #1758 )
* HDRP: Add support of light layering for forward (first draft)
TODO:
- Test instancing
- Check perf
- add an option to disable light layer support + in frameSettings
- add deferred rendering support (mean add an optional extra GBuffer)
* Add LightLinking support (version 1 - compile)
This PR add support of LightLayers feature.
To use it, setup mask renderingLayers on renderers and LightLayers on a lights. If a logical and of both give a non 0 value, the light is apply, otherwise it isn't.
This mean that by default LightLayers is 1 and RenderingLayers is 1. Then user can say LightLayers is only 2 and it will only affect renderingLayers with 2 or 3 mask value.
LightLayers require an extra GBuffer in deferred, mean it have extra bandwidth and memory cost.
LightLayers once enabled in HDRPAsset with SupportLightLayers can be control by FrameSettings. Mean a camera can enable extra RT only for an in game cinematic.
This PR refactor...
6 年前
b425d23e
Merge branch 'master' into tests/hdrp/distortion
6 年前
a2d7bf8d
Merge pull request #1759 from Unity-Technologies/Add-Light-Layers
Add light layers features
6 年前
31e46703
Merge pull request #1761 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
be0eb3c8
Merge branch 'master' into tests/hdrp/distortion
6 年前
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7b744594
Merge branch 'master' into xrsettings
6 年前
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
4dd21879
Hide MSAA framesettings
6 年前
eb899d7b
Merge pull request #1840 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
b953de4f
Merge branch 'master' into volume-texture-tool
6 年前
b5fa681b
Merge branch 'master' into HDLightExplorerExtension
6 年前
ce4065fd
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
05f23629
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
01ba67bc
Add shadowMap16Bit support
6 年前
5c6caff1
Merge pull request #1846 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
507df163
Merge branch 'master' into lw/light-attenuation
6 年前
106a0d43
Merge branch 'hdrp/staging' into hdrp/refactor-reflectionProbe/merge-probe-editors
6 年前
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
Frédéric Vauchelles
GitHub
Evgenii Golubev
Sebastien Lagarde
sebastienlagarde
Julien Ignace
Remy
Paul Melamed
Felipe Lira
uygar
John
Peter Andreasen
Tim Cooper
Robert Srinivasiah
Alex Lian
Thomas
John Parsaie
Aleksandr Kirillov
Raymond Graham
Stephane Laroche
Yao Xiaoling
Jean-François F Fortin
Chris Tchou
Peter Bay Bastian
Nerites
Antoine Lelievre
Matt Dean
Remi Slysz
RSlysz
egomeh
Yao Xiao Ling