Sebastien Lagarde
0cdbadfa
First draft
7 年前
Sebastien Lagarde
2d0640a5
Draft 2
7 年前
sebastienlagarde
b0813df9
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
7 年前
Sebastien Lagarde
240bc3d1
first compiling version
7 年前
Sebastien Lagarde
13cec969
Make it work in full forward, fix other compil issue. Disney/Jimenez ok, transmission not working
7 年前
sebastienlagarde
b2780d61
Add a subsurface scattering manager to allocate RT
7 年前
Sebastien Lagarde
414e5846
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
7 年前
Sebastien Lagarde
9d76a937
Fix issue with sss profile decoding
7 年前
Sebastien Lagarde
d1ee0342
minor adjustement
7 年前
Sebastien Lagarde
bc97a04c
recreate SSS settings assets
7 年前
sebastienlagarde
f3d7f5bf
Address feedback
7 年前
GitHub
b04739d1
Merge pull request #641 from Unity-Technologies/Support-forward-SSS
Add support for forward sss
7 年前
Evgenii Golubev
b5ba35ad
Clean up the code which fills BSDFData
7 年前
GitHub
fcbabc39
Merge pull request #643 from EvgeniiG/master
Clean up the code which fills BSDFData
7 年前
Julien Ignace
256c35aa
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Paul Melamed
68425c93
Merge branch 'master' into prototype/decals
# Conflicts:
# SampleScenes/HDTest/GraphicTest/RealtimeCubemaps.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Remy
5d52724a
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Felipe Lira
711a16fb
Merge branch 'master' into LightweightPipeline
7 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
7 年前
Peter Bay Bastian
981c0965
Assembly definition files + move various Editor folders into a common Editor folder (needed for assembly definition files)
7 年前
Julien Ignace
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Evgenii Golubev
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
sebastienlagarde
4b3eb2ca
Move files to subsurface scattering folder and code to subsurface manager
7 年前
Sebastien Lagarde
1240cc88
Merge remote-tracking branch 'refs/remotes/origin/master' into Clean-SSS-code
7 年前
Sebastien Lagarde
44dc1fce
Move SSS files, move code to Subsurface manager
- Add various resource to the render pipeline asset
- Move SSS shader/CS from lit to subsurface folder
- Move SSS related function from HDRenderPipeline to SubsurfaceManager
- Rename renderPipelinesResources to renderPipelineResources at various
place
7 年前
Sebastien Lagarde
5844867b
Various fix: shader path update + recreate RenderPipelineResources
7 年前
Sebastien Lagarde
8627b7a9
Update render pipeline resource for graphic test
7 年前
Robert Srinivasiah
8dcec595
Move all RenderTexture creation to RenderTextureDescriptor
7 年前
Sebastien Lagarde
3900be38
Revert various change, as RenderTexture are needed for UAV + fix issue in Jimenez
7 年前
Sebastien Lagarde
30b2b456
Add Fresnel term to SSS profile
7 年前
Sebastien Lagarde
0f08d1ce
Move SSS PushGlobalParams code into SSS Manager
7 年前
GitHub
13f0f587
Merge pull request #676 from Unity-Technologies/Clean-SSS-code
Clean and move SSS code
7 年前
Remy
bb73d4c6
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
GitHub
10e23187
Merge branch 'master' into volume-improvements
7 年前
Sebastien Lagarde
b8b6dd9b
Push second draft
7 年前
sebastienlagarde
1dc58532
Add global/local/debug system (Working version)
7 年前
sebastienlagarde
feabd543
another round of change
7 年前
sebastienlagarde
cf6142d2
Another no compiling draft
7 年前
Evgenii Golubev
effdbb9c
Merge branch 'master'
7 年前
Julien Ignace
71f453af
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/RuntimeFilterIBL.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
7 年前
Evgenii Golubev
7779e807
Merge branch 'master'
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
Evgenii Golubev
5da18693
Add temporal integration support to the Disney SSS
7 年前
Evgenii Golubev
87d573e5
Optimize loop: 1x FR & 2x QR => 4x FR
7 年前
GitHub
77ea5426
Merge pull request #688 from Unity-Technologies/Refactor-frameSettings
Refactor FrameSettings system
7 年前
Sebastien Lagarde
5f2183f6
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/ReflectionProbeEditor
7 年前
sebastienlagarde
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 年前
GitHub
e97ba4d0
Merge pull request #691 from Unity-Technologies/Update-FrameSettings
Update frame settings - adress various feedback
7 年前
sebastienlagarde
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 年前
Julien Ignace
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 年前
GitHub
b8b228d9
Merge pull request #693 from EvgeniiG/master
Add temporal integration support to the Disney SSS
7 年前
Evgenii Golubev
78563feb
Merge branch 'master'
7 年前
Frédéric Vauchelles
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Paul Melamed
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 年前
Peter Andreasen
87c36d52
merged with master
7 年前
sebastienlagarde
12f9f9dc
HDRenderPipeline: Move all files into HDRP folder
7 年前
GitHub
e6be7573
Merge pull request #708 from Unity-Technologies/Move-all-file-from-HDRenderPipeline-to-HDRP
HDRenderPipeline: Move all files into HDRP folder
7 年前
sebastienlagarde
4b26e012
Move all core file to subfolder CoreRP + update shader include path to CoreRP/ShaderLibrary
7 年前
GitHub
3be07b99
Merge pull request #710 from Unity-Technologies/Move-Core-to-CoreRP
Move all core file to subfolder CoreRP + update shader include path t…
7 年前
Julien Ignace
713d15c0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
7 年前
sebastienlagarde
15efd9d7
Merge branch 'master' into Convert-shaderLibrary-to-half-float-support
7 年前
Frédéric Vauchelles
e239e312
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Robert Srinivasiah
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 年前
Robert Srinivasiah
8e50e01c
More post-merge fixes for SSSManager
7 年前
Remy
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 年前
Robert Srinivasiah
8f06f09b
Missed instance of legacy GetTemporaryRT
7 年前
GitHub
61d487bc
Merge pull request #732 from Unity-Technologies/xr-hdrp_rt_mgmt
Use RenderTextureDescriptor in HDRP (XR infrastructure)
7 年前
Sebastien Lagarde
505c829f
HDRenderPipeline: use width instead of height for depth and color pyramid for consistency
+ use sRGB for SSSBuffer in forward only
7 年前
GitHub
0ff42147
Merge pull request #734 from Unity-Technologies/Minro-fix-after-merge-XR-PR
HDRenderPipeline: use width instead of height for depth and color pyramid for consistency
7 年前
Paul Melamed
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
7 年前
Robert Srinivasiah
847eac52
Remove redundant clear of SSS filtering target
Looks like an accidental leftover
7 年前
GitHub
10adf10a
Merge pull request #736 from Unity-Technologies/redundant-sss-clear-fix
Remove redundant clear of SSS filtering target
7 年前
Felipe Lira
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 年前
Mike Wuetherick
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
sebastienlagarde
b9b30507
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
sebastienlagarde
87474f24
Change selection of SSS method from dynamic to static
7 年前
GitHub
af675f6c
Update SubsurfaceScatteringManager.cs
7 年前
GitHub
4a2f5d61
Merge pull request #741 from Unity-Technologies/change-SSS-selcetion-to-be-static
Change selection of SSS method from dynamic to static
7 年前
Sebastien Lagarde
24ac5a9e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
sebastienlagarde
71b735aa
HDRenderPipeline: Add stencil readmask where it make sense
7 年前
sebastienlagarde
d3e56499
Fix issue with defaultAdditionalData creating unwanted light + fix stencilMask for deferred
7 年前
GitHub
aced0e6c
Merge pull request #748 from Unity-Technologies/Fix-issue-with-stencil-and-motion-vector
Fix issue with stencil mask and motion vector
7 年前
Thomas
efa21d88
Merge branch 'master' into volume-asset-switch
7 年前
GitHub
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
lyndon homewood
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 年前
Frédéric Vauchelles
db81a499
Merge branch 'master' into feature/HDCameraEditor
7 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
Sebastien Lagarde
61c2e24d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
Sebastien Lagarde
c3a7633d
Rename SubsurfaceProfile to DiffusionProfile and SubsurfaceRadius to SubsurfaceMask
7 年前
Sebastien Lagarde
a8ab890d
Rename SubsurfaceScattering Settings/Editor to DiffusionProfile + various file renaming/moving
7 年前
GitHub
76304378
Merge pull request #758 from Unity-Technologies/Rename-Subsurface-Profile-=---Diffusion--profile
Update Subsurface profile
7 年前
Sebastien Lagarde
e059a00a
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Sebastien Lagarde
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 年前
Sebastien Lagarde
eb916f23
More draft
7 年前
GitHub
afc49b99
Merge pull request #759 from Unity-Technologies/Decouple-SSS-and-transmission-option
Decouple SSS and Transmission option
7 年前
Sebastien Lagarde
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 年前
GitHub
8a47af65
Fix a typo (thanks, Matt)
7 年前
sebastienlagarde
6a8cf97f
use transmission tint to disable transmittance instead of adding a multiplier
7 年前
sebastienlagarde
fa1e2b55
Various renaming
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
7 年前
sebastienlagarde
f6268b77
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Thomas
69b36beb
Moved the custom sampler stuff out of HDRenderPipeline and streamlined the API
7 年前
GitHub
19ff5eb4
Merge pull request #764 from Unity-Technologies/Refactor-GBuffer-with-material-feature
Rearrange GBuffer and material classification to switch to material features
7 年前
Frédéric Vauchelles
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
GitHub
d9a17bb3
Merge pull request #771 from Unity-Technologies/cleanup-misc
Small fixes, cleanup
7 年前
Sebastien Lagarde
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
lyndon homewood
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
Julien Ignace
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 年前
Robert Srinivasiah
3b9c6146
Remove UAV hack from CoreUtils.UpdateRenderTextureDescriptor
Properly manage UAV + MSAA from the code that calls CreateCmdTemporaryRT
Plus some extra cleanups
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
Julien Ignace
4919b7ad
Merge branch 'master' into Branch_ScreenSpaceShadows
# Conflicts:
# ScriptableRenderPipeline/Core/ShaderLibrary/Random.hlsl
# ScriptableRenderPipeline/Core/Shadow/AdditionalShadowData.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.Styles.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/DeferredDirectionalShadow.compute
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl
7 年前
Kay Chang
42c358c5
Added Switch support for SRP sample project.
C# scripts modified to build without XR support on Switch.
7 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Evgenii Golubev
d6e30390
Remove 2x QR instruction from the SSS pass
7 年前
GitHub
9d3b9c14
Merge pull request #801 from Unity-Technologies/pr/798
Pr 798
7 年前
Remy
2289f880
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/Scripts/Editor/GraphicTests/HDRenderPipeline/DebugViewController_Editor.cs.meta
7 年前
Evgenii Golubev
7d2031ec
Merge branch 'master'
7 年前
Paul Melamed
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
Frédéric Vauchelles
86df6636
Merge master
7 年前
Julien Ignace
4172199d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScreenSpaceShadows
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/Sphere/Sphere.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.meta
7 年前
Arnaud Carre
074f76bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into lwrp_batcher
7 年前
sebastienlagarde
fa4d6567
Fix missing stencil mask in SSS jimenez version
7 年前
sebastienlagarde
ccfd0b9c
Fix issue with SSS and material classification
7 年前
GitHub
8aebdb18
Merge pull request #820 from Unity-Technologies/Fix-issue-with-SSS
Fix misc issue with sss
7 年前
Julien Ignace
03e54099
(WIP) Changed all HDRP RenderTextures to RTHandles
7 年前
Julien Ignace
d7f39ddf
- Added new HDUtils RenderTarget utilities that set viewport correctly for scaled RTs in HDRP
- Changed all calls in HDRP.
7 年前
Evgenii Golubev
8432b6cc
Update the G-Buffer layout
https://docs.google.com/spreadsheets/d/1-85pJ1w7elwIMKR7HQmQGaekoZuPwHvlkusFrkRTstw/edit?usp=sharing
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
Frédéric Vauchelles
5f6876d6
Merge branch 'master' into feature/PlanarReflection
7 年前
John
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Paul Melamed
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
GitHub
bb5db01e
Merge pull request #835 from EvgeniiG/opt_ps4_2018_01
Update the G-Buffer layout
7 年前
sebastienlagarde
55b8c071
Add various comment and init Fresnel0 and SubsurfaceMask
- Add various comment
- Add setup of Fresnel0 in transmission (in addition to SSS)
- Remove the call to DecodeFromSSSBuffer and init SubsurfaceMask instead
- Rename all packInt function to PackUint
7 年前
GitHub
8ab4d587
Merge pull request #837 from Unity-Technologies/Update-Gbuffer-Layout-second
Add various comment and init Fresnel0 and SubsurfaceMask
7 年前
Sebastien Lagarde
b32a2d17
Merge remote-tracking branch 'refs/remotes/origin/master' into HDRP_GraphicTests
7 年前
Remy
c3c7eec1
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity
7 年前
Sebastien Lagarde
a5003db5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/PlanarReflection
7 年前
Sebastien Lagarde
7d15e152
Update comment + rename packUint to PackInt function
7 年前
GitHub
0a952cb2
Merge pull request #845 from Unity-Technologies/adress-PR-837-feedback
Update comment + rename packUint to PackInt function
7 年前
sebastienlagarde
1d94ca60
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow
7 年前
John
cf25c602
Merge master
7 年前
Frédéric Vauchelles
504ba0e9
[PlanarProbes] Packed env light data and env proxy data
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Paul Melamed
163fdc44
Intermediate commit
7 年前
Paul Melamed
8c9541db
Filling out HTile mask in DBuffer, fix for material foldout update on decal material change
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
John
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Frédéric Vauchelles
d6743fba
Merge branch 'master' into feature/PlanarReflection
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Frédéric Vauchelles
6950663c
[PlanarReflection] Removed incorrect include
7 年前
Julien Ignace
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 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
GitHub
2654231e
Merge pull request #872 from Unity-Technologies/hdrp-msaa
HDRP + MSAA: Initial infrastructure
7 年前
sebastienlagarde
a2c27894
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
sebastienlagarde
48efe04c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Sebastien Lagarde
06cc94c3
Update comment
7 年前
GitHub
c0bd137f
Merge pull request #882 from Unity-Technologies/Updating-UI-for-material-feature-ID
Updating UI for clear coat and transmission
7 年前
Paul Melamed
3441b497
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
Remy
2136ed15
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
GitHub
f3a96513
Merge pull request #885 from Unity-Technologies/prototype/decals_gpu_optimization
Prototype/decals gpu optimization
7 年前
sebastienlagarde
89cfaa68
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-encoding-1212to888
7 年前
Tim Cooper
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
John
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
John
0bfdddfc
Merge Screen Shadows
7 年前
Remy
3d76f69e
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Julien Ignace
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 年前
Julien Ignace
bac44977
Post merge fixes
7 年前
sebastienlagarde
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Frédéric Vauchelles
672c909b
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta
# Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta
7 年前
sebastienlagarde
18cd3660
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-Menu-location-and-label
7 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
sebastienlagarde
a640342d
Remove 's' in SupportsXXX
7 年前
Julien Ignace
edd34849
Merge branch 'Branch_RTRefactoring' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
7 年前
Evgenii Golubev
88a993dd
Store SSS flags inside bsdfData.materialFeatures
7 年前
GitHub
a6688080
Merge pull request #878 from Unity-Technologies/Branch_RTRefactoring
Refactoring of HDRP render texture usage using RTHandles
7 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
sebastienlagarde
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
sebastienlagarde
116379ee
Add memory RT name/information everywhere
7 年前
GitHub
c5f1b40c
Merge pull request #924 from Unity-Technologies/Test-RTHandleNaming
Add RenderTarget Memory information
7 年前
Remy
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
7 年前
Robert Srinivasiah
44fabb65
Merge branch 'master' into hdrp-xr-initial
7 年前
John
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
John
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
7 年前
sebastienlagarde
301dbf72
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
7 年前
sebastienlagarde
5e5e46c8
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Remy
619cd52e
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
35560656
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Paul Melamed
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
7 年前
Evgenii Golubev
070349c8
Merge branch 'master'
7 年前
sebastienlagarde
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
GitHub
dc676759
Merge pull request #940 from EvgeniiG/fix_sss_radius_bug
Fix SSS radius bug (+ misc changes)
7 年前
sebastienlagarde
2bc6907f
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-forward-opaque-pass
7 年前
Remy
73141567
Merge remote-tracking branch 'origin/master' into MaterialUpgrader_Upgrade
7 年前
Remy
fa829be3
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode.unity.png
7 年前
Robert Srinivasiah
7427bb14
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Sebastien Lagarde
a60a0d5a
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
Evgenii Golubev
d8fdbbec
Implement random rotations of the SSS kernel
7 年前
Evgenii Golubev
8e2d18df
Fix the sample count bug
7 年前
Evgenii Golubev
d55eee9c
Add a TODO
7 年前
Evgenii Golubev
5565550b
Do not use the 32x32 macrotile order
All we care about is the optimal layout inside each 8x8 tile
7 年前
Evgenii Golubev
518ddfa0
Add an option to oversample SSS in the settings
7 年前
sebastienlagarde
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
uygar
275279fa
Introduced new macros for flow control attributes.
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
GitHub
2376836c
Merge pull request #858 from Unity-Technologies/shadows-biasing
Shadows biasing
7 年前
Robert Srinivasiah
6626255e
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Thomas
44dd9f42
Merge branch 'master' into debug-menu-refactor
7 年前
Evgenii Golubev
2d48e00b
Merge branch 'master'
7 年前
GitHub
e315e2a7
Merge pull request #972 from EvgeniiG/improve_sss
Improve the quality of Disney SSS
7 年前
Evgenii Golubev
3ad3c7d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
a8065d95
Add code for future experimentation
7 年前
Julien Ignace
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
7 年前
Robert Srinivasiah
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)
7 年前
Remy
2001df3c
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Julien Ignace
d4548639
Added #pragma_only_renderers to compute shaders.
7 年前
GitHub
3e5a3c18
Merge pull request #992 from Unity-Technologies/Branch_PragmaRenderersCompute
Added #pragma_only_renderers to compute shaders.
7 年前
Peter Bay Bastian
ba0ce030
Merge branch 'master' into integrate-sg-subshaders
7 年前
Remy
c0e3d9ab
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
GitHub
897f5e29
Save a few ALUs
7 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
Paul Melamed
6f570901
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
Sebastien Lagarde
3a5a6a2f
Save a few ALUs
7 年前
sebastienlagarde
003ed8ce
Add pipeline subshader tags for HD
7 年前
sebastienlagarde
9630d754
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
7 年前
GitHub
47d42b36
Merge pull request #1 from Unity-Technologies/master
Merge from main
7 年前
Matt Dean
938ae294
Add pipeline subshader tags for HD
7 年前
sebastienlagarde
2e64322b
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
7 年前
GitHub
41034aa7
Merge pull request #1016 from Unity-Technologies/pr/1014
Pr 1014
7 年前
Robert Srinivasiah
7733d48a
Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前
Paul Melamed
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
John Parsaie
0fe793d7
Merge 2018.1
7 年前
Evgenii Golubev
720c8a19
Merge branch 'master'
7 年前
Evgenii Golubev
dd8b51a8
Merge branch 'master'
7 年前
Frédéric Vauchelles
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
7 年前
Evgenii Golubev
2202a083
Remove UnityPerCamera, introduce UnityPerView
7 年前
GitHub
0b924990
Fix the ordering of SetRenderTarget() calls
Avoid binding the same texture as an RT and a UAV.
7 年前
Stephane Laroche
41d1587f
Merge branch 'master' into StackLitWork
7 年前
Frédéric Vauchelles
0ade2a97
Merge branch 'master' into feature/SSR
7 年前
Frédéric Vauchelles
7a47594e
Updated RTHandle class to an instance class
7 年前
Evgenii Golubev
8d663ac4
Merge upstream/master
7 年前
Paul Melamed
5e4ad2d7
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
7 年前
Evgenii Golubev
c4d118bd
Rename 'param' -> 'params' for consistency
7 年前
Felipe Lira
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...
7 年前
Evgenii Golubev
2c4bd864
Add and/or rename to legacy Unity shader variables
7 年前
GitHub
858b64ad
Merge pull request #1197 from EvgeniiG/rename_unity_per_camera
Rename UnityPerCamera CBuffer variables (and set them from C#)
7 年前
Evgenii Golubev
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Evgenii Golubev
b465602c
Optimize
7 年前
Kay Chang
53b01e3a
WIP adding Switch support.
7 年前
Kay Chang
f5303717
Revert "WIP adding Switch support."
This reverts commit 9af0c8f34d9c5f809e96bd5f5502d6ac28b1f330.
7 年前
Remy
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...
7 年前
Kay Chang
c279dc9c
Re-added modified files for Switch without BOM.
7 年前
Frédéric Vauchelles
09596c67
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Stephane Laroche
61ee5830
Merge branch 'master' into stacklit
7 年前
GitHub
3a0290a2
Merge pull request #1225 from EvgeniiG/master
Port global density volumes to the interpolation volume framework (+ misc improvements)
7 年前
Stephane Laroche
8cf60948
Merge remote-tracking branch 'mainrepo/master' into stacklit
7 年前
Frédéric Vauchelles
e98f1b57
Updated RTHandle class to an instance class
7 年前
GitHub
4a9bfb82
Merge pull request #1230 from Unity-Technologies/feature/BufferedRTHistoryPerCamera
Buffered RT History per camera
7 年前
Remy
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...
7 年前
Frédéric Vauchelles
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
7 年前
Evgenii Golubev
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
7 年前
Evgenii Golubev
3112d459
Reduce the time spent on LDS bank conflicts from 15% to 8%
7 年前
sebastienlagarde
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
7 年前
GitHub
f8e74a10
Merge pull request #1277 from Unity-Technologies/switch_support
Switch support
7 年前
Stephane Laroche
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
7 年前
Stephane Laroche
ecc9d71b
Merge remote-tracking branch 'mainrepo/master' into stacklit
7 年前
sebastienlagarde
2c1c78cf
Merge branch 'master' into 2018.1-experimental
7 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
7 年前
Raymond Graham
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
7 年前
Evgenii Golubev
91dc696c
Merge upstream/master
7 年前
sebastienlagarde
3094fbeb
Fix issue with smoothness and sky lighting
7 年前
GitHub
269a85d2
Merge pull request #1301 from Unity-Technologies/Fix-issue-with-smoothness-and-sky-lighting
Fix issue with smoothness and sky lighting
7 年前
sebastienlagarde
f816f1cd
Merge branch 'master' into 2018.1-experimental
7 年前
sebastienlagarde
89270e64
Rename _MainDepthTexture to _CameraDepthTexture (For builtin compatibility)
Old code require to use _CameraDepthTexture name, we have change it to
MainDepthTexture a while ago because of bug due to usage of
GetTemporaryRT, as we don't use GetTemporaryRT anymore we can now come
back to the original name
7 年前
Frédéric Vauchelles
4bfaa623
merge master
7 年前
GitHub
ffbc0097
Merge pull request #1308 from Unity-Technologies/Rename-_MainDepthTexture-to-_CameraDepthTexture
Rename maindepthtexture to cameradepthtexture
7 年前
sebastienlagarde
1b094ec9
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
GitHub
c3aaee56
Merge pull request #1302 from EvgeniiG/master
Move the Volumetric Lighting system to the RTHandle system
7 年前
sebastienlagarde
05ee75ca
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
Evgenii Golubev
cace3d6d
Merge upstream/master
7 年前
sebastienlagarde
01cd6f98
Add FrameSettings to hdCamera
7 年前
GitHub
17d5bb27
Merge pull request #1327 from Unity-Technologies/Add-FrameSettings-to-hdCamera
Add framesettings to hdcamera
7 年前
Stephane Laroche
e0b3d217
Merge branch 'master' into stacklit
7 年前
sebastienlagarde
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
7 年前
Felipe Lira
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Felipe Lira
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Evgenii Golubev
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Frédéric Vauchelles
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
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Frédéric Vauchelles
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
7 年前
sebastienlagarde
bba0731d
HDRP: Change settigs name from supportForwardOnly to supportOnlyForward
7 年前
GitHub
012f4b1f
Merge pull request #1417 from Unity-Technologies/Change-name-of-supportOnlyForward
HDRP: Change settigs name from supportForwardOnly to supportOnlyForward
7 年前
sebastienlagarde
5fd64011
Prepare NormalBuffer support in forward
7 年前
GitHub
84c9e15c
Merge pull request #1505 from Unity-Technologies/normal-buffer-support
Add export of normal+Roughness during depth prepass for forward
7 年前
Stephane Laroche
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
Oliver Schnabel
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
7 年前
Remy
98989fb6
Merge branch 'master' into HDRP-Tests
7 年前
Felipe Lira
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
7 年前
Thomas
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
Chris Tchou
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
7 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
Sebastien Lagarde
162b8ee9
Draft of refactoring of SSS and Transmission code, to share more code
7 年前
sebastienlagarde
870dbb61
Large refactor of transmission code to share it between material
7 年前
GitHub
e4f61ef1
Merge pull request #1560 from Unity-Technologies/Factor-SSS-and-Transmission-code
Refactoring code of SSS and Transmission to be able to share it between material
7 年前
Nerites
4d2914e0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
Stephane Laroche
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
7 年前
GitHub
32210ac9
Merge branch 'master' into switch-support
7 年前
GitHub
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
7 年前
Evgenii Golubev
6c2d5efb
Rename SSS quality levels
7 年前
GitHub
8dddca48
Merge pull request #1606 from EvgeniiG/kernel_quality_levels
Add an option to the HDRP asset to increase the resolution of volumetric lighting
7 年前
sebastienlagarde
7934a87a
Merge branch 'master' into LightUnits
6 年前
Paul Melamed
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
Remy
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 年前
sebastienlagarde
17fc0b8a
Fix issue with asset processor
6 年前
Remy
5cc111b3
Merge branch 'master' into hdrp/material-upgrader
6 年前
Matt Dean
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
Matt Dean
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
Stephane Laroche
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
Tim Cooper
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
Nerites
cc9ae6f7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Nerites
9b69a952
Merge xrconfig branch into xrsettings
6 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
Julien Ignace
be5922ef
Refactor of constant buffers in HDRP
- Merged PerFrame/PerView into UnityGlobal
- Merged most sub systems constant buffers into UnityGlobal (decal, subsurface, lighting, ...)
- Moved AtmosphericScattering into the Lighting folder.
6 年前
GitHub
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
GitHub
56f9ddaa
Merge pull request #1704 from Unity-Technologies/HDRP/constant-buffer-refacto
Refactoring of HDRP constant buffers
6 年前
GitHub
3f424739
Merge pull request #1713 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
Stephane Laroche
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
Nerites
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Nerites
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
Julien Ignace
13c603cb
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
Nerites
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
GitHub
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 年前
GitHub
a2d7bf8d
Merge pull request #1759 from Unity-Technologies/Add-Light-Layers
Add light layers features
6 年前
GitHub
31e46703
Merge pull request #1761 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
be0eb3c8
Merge branch 'master' into tests/hdrp/distortion
6 年前
Julien Ignace
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
Yao Xiaoling
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
Nerites
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
GitHub
7b744594
Merge branch 'master' into xrsettings
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
GitHub
ab50aaeb
Remove SSS jitter if TAA is off
6 年前