Paul Melamed
982555b5
beginning work on decal shader
7 年前
Paul Melamed
650a7ab4
debugging projecting a decal onto geometry
7 年前
Paul Melamed
c4761310
color map and normal maps working for decals
7 年前
Paul Melamed
46c0667a
Blend decal normals in tangent space
7 年前
Paul Melamed
a5eb21ff
cleaned up decal shader, added custom UI for decal shader
7 年前
Paul Melamed
d9d7b2cb
refactor to address all comments by Sebastien in slack conversation.
7 年前
Paul Melamed
d31d3ab4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Paul Melamed
ddee46ec
fix decal rendering in editor
7 年前
Paul Melamed
dd2f4c60
Decals work with master and trunk
7 年前
Paul Melamed
8fd4e73b
fix some empty lines and indentation
7 年前
sebastienlagarde
2f16949c
HDRenderPipeline decals: Addressed PR feedback
7 年前
sebastienlagarde
e1357721
Disable decal for now, (WIP)
7 年前
GitHub
fe7019b2
Merge pull request #657 from Unity-Technologies/Disable-decal-for-now
Disable decal for now, (WIP)
7 年前
Peter Bay Bastian
981c0965
Assembly definition files + move various Editor folders into a common Editor folder (needed for assembly definition files)
7 年前
Paul Melamed
1f7d870b
addressed some PR commenst, started adding metal, smoothnes, height to decals.
7 年前
Paul Melamed
3b75ece2
temp fixed include issues for some .compute shaders
added metal, smoothness to decals
7 年前
Evgenii Golubev
4cd2d228
Replace all sampler macros with SAMPLER
7 年前
Paul Melamed
2df92783
changed input textures layout for decals
7 年前
GitHub
f080e1c3
Merge pull request #672 from EvgeniiG/master
Reduce the number of samplers used by the HDRP
7 年前
Remy
79cf2e14
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Evgenii Golubev
c16681df
Merge branch 'master'
7 年前
Sebastien Lagarde
1240cc88
Merge remote-tracking branch 'refs/remotes/origin/master' into Clean-SSS-code
7 年前
GitHub
10e23187
Merge branch 'master' into volume-improvements
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 年前
sebastienlagarde
4b23291d
HDRenderPipeline: Fix compil of decal
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 年前
Paul Melamed
50503a53
Merged with master.
integrated decal group culling with HDRenderPipeline
7 年前
Paul Melamed
e2add901
intermediate commit for decal height map
7 年前
Paul Melamed
a1129802
cleaned up gecal group culling code, mask blend uses total material blend
7 年前
Paul Melamed
097ea5b1
height is being written to dbuffer
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 年前
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 年前
Paul Melamed
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
7 年前
Paul Melamed
57775e99
Clean up decal culling. New global shader variable to skip decal contribution when none are visible.
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 年前
GitHub
ca60bb19
Merge pull request #742 from Unity-Technologies/prototype/decals_no_height
Prototype/decals no height
7 年前
Sebastien Lagarde
cd92c7dc
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
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 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Paul Melamed
651c6311
generating decal normal to decal space matrix in vertex shader
7 年前
Paul Melamed
bd31b3cc
Temp commit, 1st attempt at instanced decals is working.
7 年前
Kay Chang
42c358c5
Added Switch support for SRP sample project.
C# scripts modified to build without XR support on Switch.
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Peter Andreasen
27da3d9e
Fixes to skymanager and decaldata lifted from p4
7 年前
Paul Melamed
983ccfcb
Using proper instancing path.
Force decals to always draw instanced.
7 年前
Paul Melamed
54cd8dad
Use alpha compositing to blend decals
7 年前
GitHub
1d07f3a6
Merge pull request #808 from Unity-Technologies/prototype/decals_drawinstance
Prototype/decals drawinstance
7 年前
Remy
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Sebastien Lagarde
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Paul Melamed
2ac82eae
Fixed cull and z test mode, because with blending decal values were blended twice per decal
7 年前
Paul Melamed
e5b34b08
passing normalToWorld in material block properties
7 年前
Frédéric Vauchelles
ca10cd2f
Merge
7 年前
Julien Ignace
03e54099
(WIP) Changed all HDRP RenderTextures to RTHandles
7 年前
Julien Ignace
427df3eb
Missing files
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
John
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Paul Melamed
d83ceb71
Use material property block to set decal normal to world instanced matrix array instead of calculating it in the shader
7 年前
GitHub
6e5bc8c0
Merge pull request #848 from Unity-Technologies/prototype/decals_premult_alpha
Prototype/decals premult alpha
7 年前
John
cf25c602
Merge master
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
6aaa2cd7
using HTile mask to determine what decal properties affect drawable geometry
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 年前
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 年前
Julien Ignace
4568be12
Post merge fixes
7 年前
Paul Melamed
afb8df01
Cleanup PR, add decal HTile mask defines
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
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 年前
Paul Melamed
afca789b
intermediate commit, decal global properties and draw/fade distance
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 年前
GitHub
6157d668
Merge pull request #896 from Unity-Technologies/decals/distance_culling
Decals/distance culling
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 年前
Paul Melamed
ffd9f57f
intermediate commit, decals pass info to gpu light culling
7 年前
Paul Melamed
cf795cc1
intermediate commit, switching to another branch
7 年前
Paul Melamed
8668ed75
decals working on transparency
7 年前
Remy
dd1d4224
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Julien Ignace
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 年前
Alex Lian
950e29d3
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
GitHub
a6688080
Merge pull request #878 from Unity-Technologies/Branch_RTRefactoring
Refactoring of HDRP render texture usage using RTHandles
7 年前
Julien Ignace
5749cc0f
Fixed HDRP when decal are disabled (issue caused by RTHandle PR)
7 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
GitHub
a2aa6eba
Merge pull request #912 from Unity-Technologies/Branch_FixRTHandleDisableDecal
Fixed HDRP when decal are disabled (issue caused by RTHandle PR)
7 年前
sebastienlagarde
9801577c
Change code generation to allow multiple debug case for the same field. allow debug view normal
7 年前
GitHub
2d823db6
Merge pull request #914 from Unity-Technologies/Add-normal-in-view-space-debug-mode
Change code generation to allow multiple debug case for the same field. allow debug view normal
7 年前
sebastienlagarde
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Julien Ignace
ffbd199e
- Fixed objects motion vectors (they were upside down)
- Fixed some warnings
7 年前
Julien Ignace
ed3443be
Revert "- Fixed objects motion vectors (they were upside down)"
This reverts commit c85edb82a9a539fba719f345433b9e2a11134046.
7 年前
Paul Melamed
f2019f6b
Bind decal HTile as a texture
7 年前
GitHub
d7d2cde3
Merge pull request #922 from Unity-Technologies/decals/forward_fix
Bind decal HTile as a global texture, fixes decals in forward rendering path.
7 年前
sebastienlagarde
116379ee
Add memory RT name/information everywhere
7 年前
sebastienlagarde
4f9577d3
Various fix
7 年前
sebastienlagarde
cd3c2788
Merge remote-tracking branch 'refs/remotes/origin/master' into Test-RTHandleNaming
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
8edea279
HDRenderPipeline: Fix various warning
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 年前
Paul Melamed
382f92e6
Some refactoring and cleanup of how decal draw data gets prepared
7 年前
Tim Cooper
aeefe219
Merge branch 'master2' into LW-LightOptimizations
7 年前
Paul Melamed
8f62c9e6
shader ID refactoring and changed from List<> to [] for some decal data structures to speed up performance
7 年前
Paul Melamed
67ffc876
PR cleanup
7 年前
Robert Srinivasiah
7427bb14
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
Sebastien Lagarde
ea8ce865
First draft
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
Paul Melamed
60d9cb71
address some PR comments
7 年前
GitHub
e8bd5bcf
Merge pull request #966 from Unity-Technologies/decals/clustered
Decals/clustered
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 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
Sebastien Lagarde
60bcac15
Fix several shader and C# warning
7 年前
Sebastien Lagarde
edfea7bc
Fix several shader and C# warning
7 年前
GitHub
a29f9db9
Merge pull request #1010 from Unity-Technologies/fix-shader-warning
Fix several shader and C# warning
7 年前
sebastienlagarde
6e72077d
Fix compiler warning for sampling textures without lod in dynamic branch, and fix decal atlas and mesh initialization.
7 年前
Paul Melamed
66660c1e
Fix compiler warning for sampling textures without lod in dynamic branch, and fix decal atlas and mesh initialization.
7 年前
GitHub
456f99ff
Merge pull request #1011 from Unity-Technologies/decals/tex2dlod_and_atlas_fix
Fix compiler warning for sampling textures without lod in dynamic bra…
7 年前
Joel de Vahl
56f21e1e
Merge remote-tracking branch 'origin/master' into LW-MaterialUpgrades
7 年前
Remy
50623c84
Merge remote-tracking branch 'origin/master' into HDRP_MaterialUpgrader
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 年前
sebastienlagarde
76abe74c
Revert modification of lightdefinition for envlight
This isn't necessary and need to be change before users start to do
modification
7 年前
sebastienlagarde
5da6f3f9
temp fix fo cluster decal
Disable mips on cluster decal to avoid warning
7 年前
Paul Melamed
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
sebastienlagarde
115e53ee
Revert modification of lightdefinition for envlight
This isn't necessary and need to be change before users start to do
modification
7 年前
GitHub
bd44f303
Merge pull request #1038 from Unity-Technologies/Revert-modification-of-lightdefinition-for-envlight
Revert modification of lightdefinition for envlight
7 年前
sebastienlagarde
3911f562
temp fix fo cluster decal
Disable mips on cluster decal to avoid warning
7 年前
GitHub
40de874d
Merge pull request #1039 from Unity-Technologies/temp-fix-fo-cluster-decal
temp fix fo cluster decal
7 年前
Aleksandr Kirillov
34c25f1b
Merge branch 'master' into LowEndPerf
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
7 年前
John Parsaie
0fe793d7
Merge 2018.1
7 年前
sebastienlagarde
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
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 年前
Julien Ignace
51790cf9
(WIP) Added debug exposure to material debug views.
7 年前
Paul Melamed
fda16b62
Fix compile warning for decals about using derivatives inside a loop
7 年前
Paul Melamed
2cf56db5
fix texture lod selection for clustered decals
7 年前
GitHub
eb9c9469
Merge pull request #1125 from Unity-Technologies/decal_compiler_warning_fix
Fix compile warning for decals about using derivatives inside a loop
7 年前
Paul Melamed
45bae982
fix decal projector not reacting to change in transform, add more descriptive comments to DecalUtilities shader code.
7 年前
GitHub
e1279e5b
Merge pull request #1132 from Unity-Technologies/decals/transform_fix
fix decal projector not reacting to change in transform, add more des…
7 年前
Paul Melamed
0c97c0da
initial commit
7 年前
Paul Melamed
76eb75c7
Merge branch 'master' into decals/texture_atlas
7 年前
Remy
75cf5fa5
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Paul Melamed
ac77aad6
For opaques use decal diffuse alpha for all channels.
For transparent, if material alpha is less than decal alpha replace it with decal alpha.
7 年前
GitHub
e34444b0
Merge pull request #1136 from Unity-Technologies/decals/alpha_refactor
For opaques use decal diffuse alpha for all channels.
7 年前
Paul Melamed
d37105f2
Merge branch 'master' into decals/texture_atlas
7 年前
Paul Melamed
0702ab28
copying sample texture into 4kx4k atlas
7 年前
Paul Melamed
ff3bd5a3
using new texture atlas to store decal textures
7 年前
Paul Melamed
19e30640
changed to use a 2d texture atlas instead of texture 2d array for decals rendered in the transparent pass
7 年前
Paul Melamed
c2c2c9b4
calculate decal texture lod outside of the loop
7 年前
Paul Melamed
15fc712f
optimize texture lod calculation for decals
7 年前
Paul Melamed
ff3c43c1
add clamping by half a texel when sampling from decal atlas
only rebuild decal atlas if out of space
7 年前
Paul Melamed
16665d1f
Use HDRenderPipelineAsset for decal atlas dimensions, print an error when decal atlas allocation fails.
6 年前
Frédéric Vauchelles
7a47594e
Updated RTHandle class to an instance class
7 年前
Evgenii Golubev
8d663ac4
Merge upstream/master
7 年前
Paul Melamed
e711a574
Make dbuffer render target clearing code more efficient (also fixes and issue where the 'mask' target wasn't cleared)
6 年前
Paul Melamed
f084a015
cleanup some commented out and unused code
6 年前
GitHub
3bcafcb4
Merge pull request #1191 from Unity-Technologies/decals/dbuffer_clear_fix
Decals/dbuffer clear fix
6 年前
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...
6 年前
sebastienlagarde
c795cf46
Merge remote-tracking branch 'refs/remotes/origin/master' into Fix-issue-with-debug-ligthing-mode
6 年前
GitHub
bc2cc021
Merge pull request #1178 from Unity-Technologies/decals/texture_atlas
Decals/texture atlas
6 年前
sebastienlagarde
a5701453
Move ComputeTextureLOD to common.hlsl
6 年前
GitHub
8c5e87ae
Merge pull request #1198 from Unity-Technologies/Move-ComputeTextureLOD-to-common
Move ComputeTextureLOD to common.hlsl
6 年前
sebastienlagarde
2e40eff7
Merge remote-tracking branch 'refs/remotes/origin/master' into stacklit
6 年前
Evgenii Golubev
b4708ef6
Merge upstream/master
6 年前
Frédéric Vauchelles
4bd00e90
Merge master
6 年前
Evgenii Golubev
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
sebastienlagarde
fbf1ccab
Remove indirect GTAO debug mode
6 年前
GitHub
879617b1
Merge pull request #1213 from Unity-Technologies/Sharing-envlight-code
HDRenderPipeline: Sharing envlight code
6 年前
GitHub
362e32d7
Merge branch 'master' into expose-numlights-per-cluster
6 年前
Kay Chang
53b01e3a
WIP adding Switch support.
6 年前
Kay Chang
f5303717
Revert "WIP adding Switch support."
This reverts commit 9af0c8f34d9c5f809e96bd5f5502d6ac28b1f330.
6 年前
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...
6 年前
Kay Chang
c279dc9c
Re-added modified files for Switch without BOM.
6 年前
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
6 年前
Stephane Laroche
61ee5830
Merge branch 'master' into stacklit
6 年前
Frédéric Vauchelles
e98f1b57
Updated RTHandle class to an instance class
6 年前
GitHub
4a9bfb82
Merge pull request #1230 from Unity-Technologies/feature/BufferedRTHistoryPerCamera
Buffered RT History per camera
6 年前
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...
6 年前
Evgenii Golubev
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
6 年前
sebastienlagarde
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
6 年前
GitHub
f8e74a10
Merge pull request #1277 from Unity-Technologies/switch_support
Switch support
6 年前
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
6 年前
Stephane Laroche
ecc9d71b
Merge remote-tracking branch 'mainrepo/master' into stacklit
6 年前
sebastienlagarde
2c1c78cf
Merge branch 'master' into 2018.1-experimental
6 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
6 年前
Raymond Graham
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
6 年前
Evgenii Golubev
91dc696c
Merge upstream/master
6 年前
Frédéric Vauchelles
4bfaa623
merge master
6 年前
sebastienlagarde
01cd6f98
Add FrameSettings to hdCamera
6 年前
GitHub
17d5bb27
Merge pull request #1327 from Unity-Technologies/Add-FrameSettings-to-hdCamera
Add framesettings to hdcamera
6 年前
Stephane Laroche
e0b3d217
Merge branch 'master' into stacklit
6 年前
sebastienlagarde
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
6 年前
Paul Melamed
ee6c1949
uv tiling working for opaques
6 年前
Paul Melamed
fc4c8aff
uv tiling works for transparents
6 年前
GitHub
416e73db
Merge pull request #1344 from Unity-Technologies/decals/tiled_uvs
Decals/tiled uvs
6 年前
Stephane Laroche
c551dc12
Merge branch 'master' into stacklit
6 年前
Felipe Lira
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
6 年前
Felipe Lira
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
6 年前
Evgenii Golubev
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
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
6 年前
Tim Cooper
fafb59af
Run code formatter.
6 年前
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
6 年前
Paul Melamed
6459cbb2
mesh decals somewhat working
6 年前
Paul Melamed
ee12a498
Mesh decals working
6 年前
Paul Melamed
737f9f82
mesh decal working with an option to use albedo as mask only
decals are always on independent of cull results
6 年前
Sebastien Lagarde
49897966
HDRP: Reorganize folder and files
6 年前
GitHub
aad9d81b
Merge pull request #1450 from Unity-Technologies/HDRP-Reorganize-folder-and-files
HDRP: Reorganize folder and files
6 年前
Paul Melamed
9f1637c0
Merge branch 'master' into decals/NoHDRP_exception
6 年前
GitHub
feb804fa
Merge pull request #1459 from Unity-Technologies/decals/NoHDRP_exception
Decals/no hdrp exception
6 年前
Stephane Laroche
d85052d9
Merge branch 'master' into StackLit2
6 年前
Chris Tchou
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 年前
GitHub
51a1873e
Merge branch 'master' into update-changelog
6 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
6 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
6 年前
Paul Melamed
5265aacd
cleanup shader #ifdef code
6 年前
Paul Melamed
f961e596
Albedo contribution flag works on transparency
6 年前
Paul Melamed
dcfe380d
Added affects transparency flag to decal projectors
6 年前
Paul Melamed
60919909
reverted accidental change to default HD material
decal shader only needs extra vertex attributes if drawing mesh decals
6 年前
Paul Melamed
aa31195d
change names of decal #defines to reflect functionality of dbuffer passes
store scale/bias of texture atlas allocations after they have been allocated
6 年前
Paul Melamed
a95094c7
Address PR comments
6 年前
GitHub
07f42589
Merge pull request #1501 from Unity-Technologies/decals/ss3_channel_mask
Decals/ss3 channel mask
6 年前
Sebastien Lagarde
0ec73e5c
Merge branch 'master' into normal-buffer-support
6 年前
GitHub
f82aef0c
Merge branch 'master' into VisualizeShadowMasks
6 年前
Stephane Laroche
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
6 年前
Paul Melamed
8b873a1e
added color swatch to decal material
6 年前
Oliver Schnabel
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
6 年前
GitHub
1f72f875
Merge pull request #1508 from Unity-Technologies/decals/color_swatch
Decals/color swatch
6 年前
Remy
98989fb6
Merge branch 'master' into HDRP-Tests
6 年前
Oliver Schnabel
2ad99218
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
6 年前
sebastienlagarde
3168adb5
Fix for shader include paths for external shaders (not in Asset folder)
This pull request is to fix the relative paths written in the shader pass definition files. These files emit the "file not found" error when included from external shaders (e.g. custom shader defined in a user project).
6 年前
GitHub
5cacc87f
Merge pull request #1511 from Unity-Technologies/Fix-for-shader-include-paths
Fix for shader include paths for external shaders (not in Asset folder)
6 年前
Felipe Lira
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
6 年前
Thomas
01ee049b
Merge branch 'master' into gfx-tests-postfx
6 年前
Oliver Schnabel
c493d0fb
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
6 年前
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
6 年前
Sebastien Lagarde
ba6fd164
Factor Lit and StackLit code
Factor code from Lit and stacklit to MaterialEvaluation.hlsl
Move AO function in LightEvalaution.hlsl to MaterialEvaluation.hlsl
6 年前
GitHub
28c52421
Merge pull request #1520 from Unity-Technologies/Factor-Lit-and-stacklit-code
Factor Lit and StackLit code
6 年前
Antoine Lelievre
516b896c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
Stephane Laroche
a49a696e
Merge branch 'master' into StackLit2
6 年前
Sebastien Lagarde
d69fdafe
HDRP: Add support for multiple PreIntegratedFGD + updte hlsl debug number
6 年前
GitHub
5a626b21
Merge pull request #1533 from Unity-Technologies/Add-support-for-multiple-PreIntegratedFGD
HDRP: Add support for multiple PreIntegratedFGD + updte hlsl debug nu…
6 年前
Remy
9db2a137
Merge branch 'master' into HDRP-Tests
6 年前
GitHub
25f5aa64
Merge branch 'master' into lw/lw-pipeline-asset-inspector
6 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
Paul Melamed
e000418f
Intermediate work
6 年前
Paul Melamed
96a4d824
inter commit
6 年前
Paul Melamed
de7b8a99
mesh decals work with some per channel masks
6 年前
Paul Melamed
8e6c1409
per channel decals work for meshes and transparency
6 年前
Paul Melamed
3c660e30
per channel decals working for all combinations
6 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Paul Melamed
43a67dcc
ran include generator
6 年前
Paul Melamed
c6fc1808
Added per channel blend selection mode for decals to render pipe asset
6 年前
Paul Melamed
30ddbe57
renamed and added the pragma multi_compile for decals to Lit shaders
6 年前
Paul Melamed
f4e0f28f
added #pragma multicompile to StackLit and some comments
6 年前
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
6 年前
GitHub
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
6 年前
Sebastien Lagarde
552ebcc1
HDRP: Improve camera relative rendering of cluster decal
6 年前
GitHub
e6b79105
Merge pull request #1596 from Unity-Technologies/improve-cluster-decal-camera-relative-rendering
HDRP: Improve camera relative rendering of cluster decal
6 年前
Sebastien Lagarde
34ae5a69
Merge branch 'master' into ios-texture-format
6 年前
Sebastien Lagarde
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
6 年前
Antoine Lelievre
a452a9db
Merge branch 'master' into LightUnits
6 年前
GitHub
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
sebastienlagarde
1555fbce
HDRP: More renaming for camera relative rendering (rename lightDefinition)
6 年前
GitHub
79ec2054
Merge pull request #1611 from Unity-Technologies/renaming-camerae-relative
HDRP: More renaming for camera relative rendering
6 年前
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 年前
Paul Melamed
d39437c1
Cleaned up PR
6 年前
Paul Melamed
1fc5aacc
adressed PR comments
moved DecalProjector transform update check to LateUpdate so it works correctly when attached to bones.
6 年前
Paul Melamed
c26acc53
intermediate commit
6 年前
Paul Melamed
d25c0df6
New ui and 3RT/4RT modes work for decals
6 年前
Paul Melamed
abdc7b2f
cleanup refactor
6 年前
Paul Melamed
40459f78
Change mask map channel selection to use check boxes
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
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
b4a3f127
Merge pull request #1674 from Unity-Technologies/decals/v2/per_channel_mask_new_ui
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 年前
Paul Melamed
bf15dbc1
added depth bias to mesh decals
6 年前
Nerites
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
GitHub
0f6c468e
Merge pull request #1729 from Unity-Technologies/HDRP/decals/v2_1/depth_bias
Hdrp/decals/v2 1/depth bias
6 年前
Paul Melamed
b61a3946
decal material draw order
6 年前
GitHub
45feea45
Merge pull request #1733 from Unity-Technologies/HDRP/decals/v2_1/material_draw_order
Hdrp/decals/v2 1/material draw order
6 年前
Paul Melamed
8ebddf0c
Changed how decal projector extents are modified in the UI, to make editing more intuitive
6 年前
GitHub
a23ab980
Merge pull request #1734 from Unity-Technologies/HDRP/decals/v2_1/snap_to_grid
Hdrp/decals/v2 1/snap to grid
6 年前
sebastienlagarde
ce6e4e7f
Revert "Merge pull request #1733 from Unity-Technologies/HDRP/decals/v2_1/material_draw_order"
This reverts commit 3a95cb98b694bf2f16fe02b83b980e4d426535f3, reversing
changes made to 034f0bad76156d1140fcef3404256f876ecd61ac.
6 年前
sebastienlagarde
b1ac2b19
Fix warning in decal shader - truncation vector
6 年前
GitHub
42d2cfa0
Merge pull request #1736 from Unity-Technologies/fix-warning-in-decal-shader
Fix warning in decal shader - truncation vector
6 年前
GitHub
07c127ac
Merge pull request #1743 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
b3ff809b
Merge branch 'master' into tests/hdrp/distortion
6 年前
sebastienlagarde
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 年前
Paul Melamed
d0f8d66e
decal material draw order
6 年前
Sebastien Lagarde
65ea94ef
Update the material upgrader system to be per material and not per project
6 年前
Paul Melamed
e21ffe2c
Fix decal set render list container
6 年前
GitHub
082b4762
Merge pull request #1746 from Unity-Technologies/HDRP/decals/v2_1/material_draw_order_fix
Hdrp/decals/v2 1/material draw order fix
6 年前
Sebastien Lagarde
09ca5ea6
Rename EnableDBuffer to EnableDecals + Fix issue with MAOS
6 年前
Sebastien Lagarde
f97c8de2
Fix issue with RT inccorectly fill in PerChannelMask mode with Smoonthess only
6 年前
Sebastien Lagarde
413dd3f2
Update shaderVariableDecal (fix issue with decal and batcher)
6 年前
Sebastien Lagarde
699fec18
Merge branch 'HDRP/staging' into Decal-compilation
6 年前
GitHub
b57e1824
Merge pull request #1747 from Unity-Technologies/Decal-compilation
Decal shader stripping and upgrade script + fix
6 年前
Sebastien Lagarde
2db5e09a
Merge branch 'HDRP/staging' into Decal-compilation-test-new
6 年前
GitHub
449e311f
Merge pull request #1749 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
Sebastien Lagarde
6f506090
HDRP: Decal - Add a comment
6 年前
GitHub
9ca2f35e
Merge pull request #1750 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Sebastien Lagarde
fbcdb866
Add DECAL_OFF for decal to remove more variant + rename
6 年前
GitHub
019f3227
Merge pull request #1757 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
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 年前
Remy
b425d23e
Merge branch 'master' into tests/hdrp/distortion
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 年前
Evgenii Golubev
0798e2ee
Remove _NORMAL_BLEND_SRC_B keyword in decal
6 年前
Sebastien Lagarde
56790568
Refactor GetBakedDiffuseLighting
- Shader code change: Rename GetBakedDiffuseLighting to ModifyBakedDiffuseLighting. This function now handle lighting model for transmission too. Lux meter debug mode is factor outisde.
- Shader code change: GetBakedDiffuseLighting is not call anymore in GBuffer or forward pass, including the ConvertSurfaceDataToBSDFData and GetPreLightData, this is done in ModifyBakedDiffuseLighting now
- Shader code change: Added a backBakeDiffuseLighting to BuiltinData to handle lighting for transmission
- Shader code change: Material must now call InitBuiltinData (Init all to zero + init bakeDiffuseLighting and backBakeDiffuseLighting ) and PostInitBuiltinData
- Update shader graph associate code
6 年前
GitHub
03616069
Merge pull request #1784 from Unity-Technologies/Improve-bakeDiffuseLighting-code
Refactor GetBakedDiffuseLighting
6 年前
sebastienlagarde
b5a32384
Remove _NORMAL_BLEND_SRC_B keyword in decal
6 年前
GitHub
6f8854ba
Merge pull request #1786 from Unity-Technologies/HDRP/staging
Hdrp/staging
6 年前
GitHub
edb6e91d
Merge pull request #1785 from Unity-Technologies/Remove-decal-shader-keyword
Remove _NORMAL_BLEND_SRC_B keyword in decal
6 年前
Antoine Lelievre
71ec7369
Merge HDRP/staging
6 年前
Remy
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
6 年前
GitHub
14f04f34
Merge pull request #1792 from Unity-Technologies/HDRP/staging
Hdrp/staging
6 年前
Paul Melamed
9d5b9b62
Fix decal 'ghosts'
6 年前
Paul Melamed
bd424212
enable editing of multiple decal projectors
6 年前
Paul Melamed
5f083851
decal normal buffer works, 1st draft
6 年前
Paul Melamed
9bac77ab
Load instead of sample dbuffer normal texture
6 年前
Paul Melamed
009933ca
cleanup
6 年前
Yao Xiaoling
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
Paul Melamed
83d9fc5d
Fix decal 'ghosts'
6 年前
GitHub
664f7384
Merge pull request #1816 from Unity-Technologies/HDRP/decals/v2_1/ghost_fix
Hdrp/decals/v2 1/ghost fix
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
GitHub
10b216d9
Merge pull request #1825 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
Paul Melamed
c68ab2bd
cleaned up PR
6 年前
Paul Melamed
0533e490
address PR comments
6 年前
Paul Melamed
26eb1cae
add decals to stacklit material
decals correctly affect normal buffer in forward and for stacklit in deferred
6 年前
Paul Melamed
376207de
Address PR comments and fix player build
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
Anis Benyoub
f6889463
Supporting Normal Buffer Writing and Decals for the fabric shader
6 年前
GitHub
d5d3d79d
Merge pull request #1880 from Unity-Technologies/fabric_normal_decal
Supporting Normal Buffer Writing and Decals for the fabric shader
6 年前
GitHub
92fa3473
Merge pull request #1857 from Unity-Technologies/HDRP/decals/v2_1/normal_buffer
Hdrp/decals/v2 1/normal buffer
6 年前
Julien Ignace
a9b03372
- Fixed stencil for decal normal pass (stencil test does not apply before UAV updates by default)
- Fixed normal buffer creation flag (was missing enableRandomWrite flag)
6 年前
GitHub
da90dff9
Merge pull request #1886 from Unity-Technologies/HDRP/fix-decal-normal-stencil
Small decal fixes
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
Paul Melamed
ab1ae523
Add API call to add and update projector decals without specifying their transform
6 年前
GitHub
4f070935
Merge pull request #1897 from Unity-Technologies/HDRP/decals/projector_api
Add API call to add and update projector decals without specifying th…
6 年前
pastasfuture
75abaaa2
Improvements to decal projector editor gizmo.
6 年前
GitHub
45793fd6
Merge pull request #1902 from Unity-Technologies/HDRP/decalprojector-gizmo-improvements-rebase-master
Improvements to decal projector editor gizmo.
6 年前
Thomas
468989ad
Merge branch 'master' into pyramid-rework
6 年前
GitHub
dbde5edb
Merge branch 'master' into gpu-terrain
6 年前
GitHub
aae1a458
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
6 年前