a8480a83
First draft
7 年前
b8b6dd9b
Push second draft
7 年前
1dc58532
Add global/local/debug system (Working version)
7 年前
feabd543
another round of change
7 年前
cf6142d2
Another no compiling draft
7 年前
db2bdfc0
More dfraft
7 年前
13eb066f
Fixed various issue and follow the deisng done with Julien. Working version
7 年前
9bf2a15f
Add a static function to register framesettings to debug windows
7 年前
1a9ca4e7
Added block of comment to explain the system
7 年前
77ea5426
Merge pull request #688 from Unity-Technologies/Refactor-frameSettings
Refactor FrameSettings system
7 年前
5f2183f6
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/ReflectionProbeEditor
7 年前
2c5f3036
Update frame settings - adress various feedback
- Rename GlobalFrameSettings => RenderPipelineSettigs
- Remove various struct and put variables in RenderPipelineSettigs/FrameSettings directly
- Add better management of camera rename/disabling with debug menu
- Add EnableObjectMotionVector
7 年前
f3665ff6
Remove code for Motion vectors in GBuffer as it don't fit our need (and don't work)
- Remove ShaderConfig.s_VelocityInGbuffer
- Remove all code for velocity in GBuffer
- added enableObjectMotionVectors in FrameSettings
- Update unity_MotionVectorsParams.y (ForceNoMotion) usage
7 年前
e97ba4d0
Merge pull request #691 from Unity-Technologies/Update-FrameSettings
Update frame settings - adress various feedback
7 年前
10b356c3
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-motion-vector-behavior
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/RenderPipeline/FrameSettings.cs
7 年前
c02d593d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/AtmosphericScattering/AtmosphericScattering.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
7 年前
21a5d864
Merge pull request #694 from Unity-Technologies/Update-motion-vector-behavior
Update motion vector behavior
7 年前
0491acf4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
78563feb
Merge branch 'master'
7 年前
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
db6f48d8
Merge branch 'master' into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs
# ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl
7 年前
87c36d52
merged with master
7 年前
0690038f
HDRenderPipeline: Homegenize name prepass postpass
7 年前
fa0eed63
Merge pull request #718 from Unity-Technologies/Homogeneous-naming-postpas-prepass
HDRenderPipeline: Homegenize name prepass postpass
7 年前
f6a78dc5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
0c9c55a9
Merge in master, with lots of fixups
Git hates merges + moves/renames.
Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager
7 年前
1f5d453d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
7 年前
ca0020dd
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/CommonSettings.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/HDRP_Test_Camera.prefab
7 年前
04b67328
Allow stereo to be enabled (not actually enabled)
Stereo is enabled with a combination of three bits:
* Asset frame settings has stereo enabled
* Stereo is enabled in the project settings
* Camera has both eyes enabled
Because the asset itself has stereo disabled, I have to keep flipping it on. Turning it on doesn't automatically enable it for other uses cases (yet).
7 年前
61d487bc
Merge pull request #732 from Unity-Technologies/xr-hdrp_rt_mgmt
Use RenderTextureDescriptor in HDRP (XR infrastructure)
7 年前
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
7 年前
c6543428
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances.meta
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances/Challenge-Brick.meta
7 年前
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
b9b30507
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
9719be6b
HDRenderPipeline: Fix shadow mask enabling in frame settings
7 年前
2da87a12
Merge pull request #740 from Unity-Technologies/Fix-shadow-mask-enabling-in-frame-settings
HDRenderPipeline: Fix shadow mask enabling in frame settings
7 年前
24ac5a9e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
cd78482a
HDRenderPipeline: Fix issue with Deferred depth prepass option in debug menu
7 年前
cd92c7dc
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
ad68db51
Merge branch 'master' into feature/HDCameraEditor
7 年前
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
064d57c1
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/Common.hlsl
7 年前
c86b3214
Merge branch 'master'
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 年前
7e74580b
Merge branch 'master'
7 年前
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
c2f60a14
Reuse internal FrameSettings to avoid GC stress
7 年前
e0fb15da
Simplified logic
7 年前
7d48de83
GC fix for LightLoopSettings
7 年前
090f131e
Revert renaming
7 年前
19ff5eb4
Merge pull request #764 from Unity-Technologies/Refactor-GBuffer-with-material-feature
Rearrange GBuffer and material classification to switch to material features
7 年前
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
d9a17bb3
Merge pull request #771 from Unity-Technologies/cleanup-misc
Small fixes, cleanup
7 年前
75345f2b
Start filtering settings dependent on MSAA
Mostly disable stuff, except forward only
7 年前
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
43f6d6eb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
7 年前
3ad8312c
Proper QualitySettings interface
InitializeFrameSettings properly enables/disables MSAA path depending on the QualitySettings.antiAliasing value
We should probably display this in the AdditionalCameraData in the future.
7 年前
9e90b376
Further cleanups for partial-functionality PR
Getting this branch ready to merge, even though we aren't at full functionality yet
7 年前
fecb6084
Extra comment re: ConfigureMSAADependentSettings
7 年前
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
42c358c5
Added Switch support for SRP sample project.
C# scripts modified to build without XR support on Switch.
6 年前
77f9f167
Merge branch 'master'
7 年前
93c49e08
- Switched sample count to a uniform to be changed by users
- Cleaned UI
- Added a variation to disable contact shadows
7 年前
3ccf74cc
merged from master
7 年前
7d2031ec
Merge branch 'master'
7 年前
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
86df6636
Merge master
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 年前
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 年前
cf25c602
Merge master
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 年前
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
2654231e
Merge pull request #872 from Unity-Technologies/hdrp-msaa
HDRP + MSAA: Initial infrastructure
7 年前
a2c27894
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
48efe04c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
3441b497
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
2136ed15
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
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 年前
b5aa10da
Fix framesettings and preview
Fix issue with preview render many undesired stuff
fix issue with debug camera menu
7 年前
a3f9fb6c
Merge pull request #895 from Unity-Technologies/Fix-framesettings-and-preview
Fix framesettings and preview
7 年前
aa273d7e
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
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-
7 年前
dd1d4224
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
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
7 年前
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.
7 年前
401bf040
Merge pull request #900 from Unity-Technologies/hdrp-msaa-ui
Add MSAA sample count support thru RenderPipelineSettings
7 年前
f8cb8a66
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
44eb9802
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
950e29d3
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
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
7 年前
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
a640342d
Remove 's' in SupportsXXX
7 年前
71d0fd3a
Rename MSAAAntiAliasing to MSAA as AA is for antialiasing already
7 年前
edd34849
Merge branch 'Branch_RTRefactoring' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
7 年前
a6688080
Merge pull request #878 from Unity-Technologies/Branch_RTRefactoring
Refactoring of HDRP render texture usage using RTHandles
7 年前
78ba9e5b
Merge master
6 年前
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
ffbd199e
- Fixed objects motion vectors (they were upside down)
- Fixed some warnings
6 年前
ed3443be
Revert "- Fixed objects motion vectors (they were upside down)"
This reverts commit c85edb82a9a539fba719f345433b9e2a11134046.
6 年前
6cf5119c
Configure frame settings dependent on stereo
6 年前
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
6 年前
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
6 年前
bafa5e7c
Merge pull request #930 from Unity-Technologies/hdrp-xr-initial
Initial stereo rendering support in HDRP
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 年前
aeefe219
Merge branch 'master2' into LW-LightOptimizations
6 年前
e768893e
Merge branch 'master'
6 年前
518ddfa0
Add an option to oversample SSS in the settings
6 年前
45dc22f9
Refactored the debug menu
Now with proper serialization in the editor and better runtime UI capabilities
6 年前
04b933d9
merged with master
6 年前
4ce28f8a
Merge pull request #970 from Unity-Technologies/debug-menu-refactor
Debug menu refactor
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 年前
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
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 年前
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 年前
47a2960a
Merge branch 'master' into LW-Bugfix
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
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 年前
b987da15
Merge branch '2018.1' into projects/system-shock/2018.1
6 年前
53b01e3a
WIP adding Switch support.
6 年前
f5303717
Revert "WIP adding Switch support."
This reverts commit 9af0c8f34d9c5f809e96bd5f5502d6ac28b1f330.
6 年前
c279dc9c
Re-added modified files for Switch without BOM.
6 年前
5f9a0791
Fix sky in preview and fog in sceneView
6 年前
50c728b8
Merge pull request #1236 from Unity-Technologies/Fix-sky-in-preview-and-fog-in-sceneView
Fix sky in preview and fog in sceneView
6 年前
3f4100e4
EnableShadowMask in FrameSettings (But shadowMaskSupport still disable by default)
6 年前
0fe78bf1
Merge pull request #1237 from Unity-Technologies/enableShadow-mask-in-framesettings
Enableshadow mask in framesettings
6 年前
9c81e0d8
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2102_GI_Emission.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2103_BakeMixed.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/9xxx_Other/9002_Deferr...
6 年前
d9f5b4f5
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Textures/RTHandleSystem.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/BufferPyramid.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyManager.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyRenderingContext.cs
6 年前
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
533beaae
Merge branch 'master' into LWRP
6 年前
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
6 年前
f8e74a10
Merge pull request #1277 from Unity-Technologies/switch_support
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 年前
ecc9d71b
Merge remote-tracking branch 'mainrepo/master' into stacklit
6 年前
2c1c78cf
Merge branch 'master' into 2018.1-experimental
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 年前
71170c2a
Fix camera preview - Remove obsolete code
6 年前
fa4df596
Fix camera editor preview
6 年前
522f0a34
Merge pull request #1333 from Unity-Technologies/Fix-camera-preview
Misc fix on camera preview and regular preview with planar reflection
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 年前
a7299df5
Forward Error pass in HDRP is now only rendered once with a full renderqueue (former split was pointless)
6 年前
c19674c0
Added false color debug mode
False color debug mode in the rendering tab of the debug wnidow
6 年前
6ccff1e8
Remove useless test.
6 年前
89f09eea
Merge pull request #1473 from Unity-Technologies/Branch_FixErrorPass
Removed useless duplication of ForwardError pass
6 年前
f7d6e7db
Merge remote-tracking branch 'mainrepo/master' into StackLit2
6 年前
97ac5bf9
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
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 年前
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
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 年前
f961e596
Albedo contribution flag works on transparency
6 年前
dcfe380d
Added affects transparency flag to decal projectors
6 年前
a95094c7
Address PR comments
6 年前
6c870111
Merge branch 'master' into FalseColorMode
6 年前
961e2a42
Merge pull request #1497 from Unity-Technologies/FalseColorMode
Added false color debug mode
6 年前
c95b7c47
Merge branch 'master' into normal-buffer-support
6 年前
29ce571e
Merge branch 'master' into decals/ss3_channel_mask
6 年前
c7c66abc
Add normalBufferManagement
6 年前
07f42589
Merge pull request #1501 from Unity-Technologies/decals/ss3_channel_mask
Decals/ss3 channel mask
6 年前
0ec73e5c
Merge branch 'master' into normal-buffer-support
6 年前
f82aef0c
Merge branch 'master' into VisualizeShadowMasks
6 年前
f22b94b1
Fix depth prepass for full deferred
6 年前
23c3f077
various fix + backport change of WRITE_NORMAL_BUFFER on all shader + add shader preprocessor
6 年前
b3d835fa
Begin to fix the color picker intensity for luxmeter (not enough precision right now)
6 年前
84c9e15c
Merge pull request #1505 from Unity-Technologies/normal-buffer-support
Add export of normal+Roughness during depth prepass for forward
6 年前
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
6 年前
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
6 年前
98989fb6
Merge branch 'master' into HDRP-Tests
6 年前
0e6fbcd6
- Fixed useless code causing exception in LightLoop UI
- Fixed a bug where Interpolation Volumes would not be updated for reflection capture.
6 年前
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
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 年前
69fc3303
edit profiler depth prepass caption + fix roughness for clearcoat
6 年前
5400a734
Merge pull request #1517 from Unity-Technologies/edit-profiler-depth-prepass-caption
HDRP: edit profiler depth prepass caption + fix roughness for clearcoat
6 年前
1e1467c4
Merge pull request #1515 from Unity-Technologies/FixColorPickerPrecisionLimit
Increased debug color picker lux limit
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 年前
516b896c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
7252b568
Removed unused line that cause a NPE when using debug without refraction enabled
6 年前
088a94ac
Merge pull request #1526 from Unity-Technologies/fix/RefractionDebugError
Removed unused line that cause a NPE when using debug without refract…
6 年前
013fb07a
Better dominant light detection algorithm
6 年前
8c01dc9c
HDRP: re-enable shadow mask menu of main window
6 年前
a49a696e
Merge branch 'master' into StackLit2
6 年前
d69fdafe
HDRP: Add support for multiple PreIntegratedFGD + updte hlsl debug number
6 年前
5a626b21
Merge pull request #1533 from Unity-Technologies/Add-support-for-multiple-PreIntegratedFGD
HDRP: Add support for multiple PreIntegratedFGD + updte hlsl debug nu…
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 年前
544a96c4
Better dominant light detection algorithm
6 年前
b1cc4f3e
Merge pull request #1543 from Unity-Technologies/DominantLightContactShadow
Contact Shadows for the dominant punctual light
6 年前
2fce5809
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
bd393bda
Merge branch 'master' into switch-support
6 年前
de7b8a99
mesh decals work with some per channel masks
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 年前
30ddbe57
renamed and added the pragma multi_compile for decals to Lit shaders
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 年前
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
6 年前
b915d855
Fix color picker mode in forward only shaders.
6 年前
6c2d5efb
Rename SSS quality levels
6 年前
f7ce098c
Add an option to the HDRP asset to increase the resolution of volumetric lighting
6 年前
9c5843f7
Remove PostProcessing dependency from Core
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 年前
981030f0
Merge pull request #1610 from Unity-Technologies/remove-core-postprocessing-dependency
Remove PostProcessing dependency from Core
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 年前
1fc5aacc
adressed PR comments
moved DecalProjector transform update check to LateUpdate so it works correctly when attached to bones.
6 年前
c26acc53
intermediate commit
6 年前
d25c0df6
New ui and 3RT/4RT modes work for decals
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 年前
b9fcc418
Fixed distortion 1-frame delay
6 年前
d8b4e92e
Merge pull request #1658 from Unity-Technologies/distortion-lag-fix
Fixed distortion 1-frame delay
6 年前
c7b86128
Merge branch 'master' into FixLightUnitUpgrade
6 年前
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
38856112
Fix merge.
6 年前
7be73727
Add renderer priority support for HDRP
This allow to have transparent order control at renderer frequency
6 年前
86a99323
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
9dccf245
Merge pull request #1672 from Unity-Technologies/Add-renderer-priority
Add renderer priority
6 年前
a66ac281
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Branch_FixPreIntegratedFGD
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
6 年前
0188d2f6
PostProcess input buffers are not copied anymore on PC if the viewport size matches the final render target size
6 年前
1d575195
- Frame Settings debug panel now uses foldouts
- Fixed a few types (frame time, light loop settings)
6 年前
bbaf4dfd
Merge pull request #1678 from Unity-Technologies/Branch_FrameSettingFoldout
Frame Settings debug panel now uses foldouts
6 年前
176e4109
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Branch_FixPPCopy
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
6 年前
5f1e8213
Merge pull request #1680 from Unity-Technologies/Branch_FixPPCopy
Branch fix pp copy
6 年前
7c6394fe
Merge pull request #1702 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
1bce3600
Merge branch 'master' into tests/hdrp/distortion
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
b4a3f127
Merge pull request #1674 from Unity-Technologies/decals/v2/per_channel_mask_new_ui
Decals/v2/per channel mask new ui
6 年前
3f424739
Merge pull request #1713 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
15880a68
Move transparent depth prepass just after the sky to avoid problems with opaque classification for lighting.
6 年前
466061e1
Fix version number in HDRP asset
6 年前
9cbef7da
Merge pull request #1720 from Unity-Technologies/Fix-version-number-in-HDRP-asset
Fix version number in HDRP asset
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 年前
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
155c2f6d
Merge pull request #1725 from Unity-Technologies/HDRP/move-transparent-prepass
Move transparent depth prepass just after the sky to avoid problems with opaque classification for lighting.
6 年前
13c603cb
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
0a934824
Removed all includes of UnityEngine.XR from HDRP. Removed all calls to
XRSettings from HDRP.
6 年前
91dc927e
fix wrong namespace runtime class
6 年前
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
2f639eeb
fix no namespace runtime class
6 年前
8996ef80
Removed ifdefs which should be unneeded with proper XRGraphicsConfig
usage
6 年前
d1950af0
Merge branch 'xrsettings' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
4312d844
Merge pull request #1730 from Unity-Technologies/hdrp/fix-namespaces
Hdrp/fix namespaces
6 年前
1b755a40
Add opacity parameter for contact shadow
6 年前
b3641a55
Merge pull request #1739 from Unity-Technologies/Add-opacity-on-contact-shadow
Add opacity on contact shadow
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 年前
a8187784
Add shader stripper support for decal variant + update HDRP asset
6 年前
09ca5ea6
Rename EnableDBuffer to EnableDecals + Fix issue with MAOS
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 年前
cb44566e
Rename _DECALS_3RT to DECALS_3RT and lower variant count
6 年前
0bdf96cc
Merge pull request #1754 from Unity-Technologies/Update-name-of-decal-keyword
Reduce number of decal shader variant
6 年前
fbcdb866
Add DECAL_OFF for decal to remove more variant + rename
6 年前
019f3227
Merge pull request #1757 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 年前
057e32db
Added the possibility to setup an override transform for volume interpolation.
6 年前
7ba755b2
Add lux unit for HDRI sky
6 年前
1eda00e6
Merge pull request #1762 from Unity-Technologies/HDRP/volume-anchor-override
Hdrp/volume anchor override
6 年前
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
da2ab148
Better HDRI sky integration formula
6 年前
0bf2f4dd
Merge pull request #1766 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
6b451d7a
Merge branch 'master' into LuxIntensityForHDRISky And moved HDRI multiplier to the editor
6 年前
5f7f16a2
Merge branch 'master' into tests/hdrp/distortion
6 年前
d33e5edc
Cleanup HDRI sky code
6 年前
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7b744594
Merge branch 'master' into xrsettings
6 年前
8b3692f4
Merge pull request #1776 from Unity-Technologies/LuxIntensityForHDRISky
Lux intensity for hdri sky
6 年前
03c9b17a
Add option to disable light by type in the debug menu
6 年前
583344b9
HDRP: Missing a file for the awake of reflection probe
6 年前
c4a34c26
Merge pull request #1781 from Unity-Technologies/DisableLightTypeDebugMenu
Disable light by type in debug menu
6 年前
4c23a388
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/staging
6 年前
38c99573
Revert "HDRP: Missing a file for the awake of reflection probe"
This reverts commit 2cc38744cad30f9ac73043b89d17aa5caae1c50e.
6 年前
fc996ba1
Merge branch 'HDRP/staging' into Improve-bakeDiffuseLighting-code
6 年前
b2cf9b0e
Added a volume to control the indirect light intensity
6 年前
8c0a4f00
Merge branch 'HDRP/staging' into Improve-bakeDiffuseLighting-code
6 年前
10164527
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/clean-proxy-volume
6 年前
de2e6ea2
Merge pull request #1783 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
6 年前
27b1c3dc
Fixed volume update light loop bug
6 年前
26c608bb
Move files to screenspace lighting and move Reflection enum in it
6 年前
5fe5a99f
Fixed global param not pushed before rendering
6 年前
0adc31b5
Merge pull request #1790 from Unity-Technologies/IndirectLightingControlVolume
Indirect lighting control volume
6 年前
f09cd77a
Merge pull request #1799 from Unity-Technologies/Create-screenspace-lighting-folder
Move file to screenspace lighting folder
6 年前
c3119430
Merge pull request #1803 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
4979052d
Moved resources initialization to RenderPipelineResources and Upgrade test to the HDRenderPipeline initialization
6 年前
5f083851
decal normal buffer works, 1st draft
6 年前
009933ca
cleanup
6 年前
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
21479c5f
Merge pull request #1812 from Unity-Technologies/FixHDRPPackageResourceUpgrade
Fix hdrp package resource upgrade
6 年前
81793f08
Fixed filter pass number in HDUtils.BlitQuad
6 年前
7c21615a
Added Luminance meter
6 年前
87a6834f
Clear sky color to black when lux meter is enabled
6 年前
10b216d9
Merge pull request #1825 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
625f8762
Merge pull request #1824 from Unity-Technologies/LuminanceMeter
Added Luminance meter
6 年前
ee4e73a4
Merge branch 'HDRP/staging' into RemoveSkyInLuxMeter
6 年前
ae4294ea
Merge pull request #1731 from Unity-Technologies/xrsettings
Removed XRSettings usage from HDRP. Protected XR usage in XRGraphicsConfig with ifdefs.
6 年前
2e1448dc
Merge pull request #1826 from Unity-Technologies/RemoveSkyInLuxMeter
Remove sky in lux meter
6 年前
2460bc17
Merge pull request #1821 from Unity-Technologies/FixFilterPassModeInBlitQuad
Fixed filter pass number in HDUtils.BlitQuad
6 年前
f75e94af
Merge branch 'HDRP/staging' into HDRP/fix/ObliqueLightLoop
6 年前
1d48127a
Merge pull request #1827 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
ff2128f3
Disable SSS when luxmeter is enabled
6 年前
3e0249d9
Moved disable SSS when luxmeter outside of frame settings initialization
6 年前
d0830c44
Merge pull request #1832 from Unity-Technologies/RemoveSSSInLuxMeter
Disable SSS when luxmeter is enabled
6 年前
f7eb9399
rewrite realtime reflection probe capture
6 年前
9a65725e
Merge pull request #1836 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
05036cac
Merge branch 'HDRP/staging' into HDLightExplorerExtension
6 年前
4a415b0c
rename deferredShadow => screenspaceshadow + change to RG16
6 年前
9577f3da
Merge pull request #1842 from Unity-Technologies/rename-deferredShadow-screenspaceshadow
rename deferredShadow => screenspaceshadow + change to RG16
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 年前
0b5f6f18
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
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 年前
9c4acb91
Import various stacklit branch change
Move specular funciton in commonlighting.hlsl
Fix issue in TextureNormalVariance
Fix issue with colorPicker not working in forward
Misc format/comment/code sharing
6 年前
2808870d
Merge pull request #1848 from Unity-Technologies/import-stacklit-change
Apply some stacklit change (fix and formatting)
6 年前
106a0d43
Merge branch 'hdrp/staging' into hdrp/refactor-reflectionProbe/merge-probe-editors
6 年前
9a93b084
Merge pull request #1853 from Unity-Technologies/HDRP/staging
Merging Hdrp/staging
6 年前
f30aa731
Add warning message for platform not supported
6 年前
cd8cac28
Rename cloth to Fabric
6 年前
994e68cb
Merge pull request #1856 from Unity-Technologies/Add-warnign-message
Add warning message for platform not supported
6 年前
5c5547e8
Removed a bunch of GC.Alloc each frame.
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 年前
0f00f09d
Merge pull request #1847 from Unity-Technologies/Add-cloth-material-anis
Finishing a first version of the implementation of the Fabric Shader
6 年前
82c30969
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
f25dd24a
Merge branch 'master' into HDRP/staging
6 年前
2befab52
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
6 年前
99f769f9
Merge pull request #1858 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
2b3f449e
Fixing winding and VFACE order issue + Remove _DetViewMatrix
6 年前
e30715d6
Implement an option to display the light volumes of Point, Spot, Line, Rectangular Lights and Reflection probes
Add a singleton that generates basic Meshes to avoid regenerating them at every frame in debug mode
6 年前
42111055
Merge branch 'master' into Fixing-winding-and-VFACE-order-issue
6 年前
ea9baba9
Merge pull request #1859 from Unity-Technologies/Fixing-winding-and-VFACE-order-issue
Fixing winding and vface order issue
6 年前
543c68af
Merge pull request #1813 from Unity-Technologies/HDRP/refactor-reflectionProbe/merge-probe-editors
Hdrp/refactor reflection probe/merge probe editors
6 年前
ab8c4439
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-gcalloc
6 年前
8b08d5f9
Revert "Hdrp/refactor reflection probe/merge probe editors"
6 年前
cda8c343
Merge branch 'master' into HDRP/staging
6 年前
0eeccd2c
Merge pull request #1868 from Unity-Technologies/revert-1813-HDRP/refactor-reflectionProbe/merge-probe-editors
Revert "Hdrp/refactor reflection probe/merge probe editors"
6 年前
e5d59bcd
Merge pull request #1864 from Unity-Technologies/HDRP/fix-gcalloc
Removed a bunch of GC.Alloc each frame.
6 年前
33f9970c
merge
6 年前
ef3dbfb8
Merge pull request #1861 from Unity-Technologies/DebugLightVolumes
Debug Light Volumes
6 年前
f1d163d5
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
6 年前
8f96dc05
Merge branch 'master' into HDRP/staging
6 年前
0533e490
address PR comments
6 年前
26eb1cae
add decals to stacklit material
decals correctly affect normal buffer in forward and for stacklit in deferred
6 年前
3e6c15b0
Merge pull request #1870 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
376207de
Address PR comments and fix player build
6 年前
f81f8c80
fix small logic issue in reflection system
6 年前
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
b6f96081
Merge pull request #1869 from Unity-Technologies/onceagain
merge reflection probe change
6 年前
38a3e185
Merge branch 'master' into HDRP/add-LightLayer-in-probes
6 年前
e7c59a70
Resolve merge conflicts
6 年前
92fa3473
Merge pull request #1857 from Unity-Technologies/HDRP/decals/v2_1/normal_buffer
Hdrp/decals/v2 1/normal buffer
6 年前
29a7899c
Fixed an issue where sometimes the deferred shadow texture would not be valid, causing wrong rendering.
6 年前
bb90e2f2
Update HDRenderPipeline.cs
Typo
6 年前
f31bc3c7
Merge branch 'HDRP/fix-deferred-shadow-init' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-deferred-shadow-init
6 年前
6302a183
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu-terrain
6 年前
8cdaae66
Merge pull request #1887 from Unity-Technologies/HDRP/fix-deferred-shadow-init
Fixed an init issue with deferred shadow texture.
6 年前
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
6e836668
Implement mipmap debug mode for terrain.
6 年前
a6854ec4
Merge pull request #1875 from Unity-Technologies/gpu-terrain
GPU Terrain (2018.3) port to HDRP and LWRP
6 年前
7ffc71c9
First pass at refactoring and speeding up depth & color pyramids
6 年前
e7f10913
Do the color pyramid in a separate buffer
6 年前
a9219e03
Cleaned up old pyramid code
6 年前
f49d867e
Fixed distortion scale
6 年前
4d9d0f45
Fix deferred shadow init ( #1900 )
Fixed an issue where sometimes the deferred shadow texture would not be valid, causing wrong rendering.
6 年前
93afc87c
Merge remote-tracking branch 'origin/master' into lw/light-attenuation
6 年前
5eed6e3a
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
bee9896f
Stop NaN propagation within volumetric lighting shader (v2)
6 年前
468989ad
Merge branch 'master' into pyramid-rework
6 年前
24f53672
Disabled MSAA on the color pyramid
6 年前
1d71d3d6
Merge pull request #1904 from Unity-Technologies/pyramid-rework
Pyramid rework
6 年前
dbde5edb
Merge branch 'master' into gpu-terrain
6 年前
aae1a458
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
6 年前
sebastienlagarde
Sebastien Lagarde
GitHub
Julien Ignace
Evgenii Golubev
Frédéric Vauchelles
Paul Melamed
Peter Andreasen
Robert Srinivasiah
Remy
Felipe Lira
Mike Wuetherick
lyndon homewood
Thomas
Raymond Graham
Kay Chang
John
uygar
Tim Cooper
Alex Lian
John Parsaie
Aleksandr Kirillov
Stephane Laroche
Yao Xiaoling
Jean-François F Fortin
Antoine Lelievre
Oliver Schnabel
Chris Tchou
Peter Bay Bastian
Nerites
Matt Dean
Remi Slysz
RSlysz
egomeh
Anis Benyoub
Yao Xiao Ling