1d081a77
Moved shadow related files into ShaderLibrary and common to reflect their general usage.
Added support for the new shadow library to fptl.
Introduced a new shadow include inline file to support different shadow setups for different light loops per project.
Restructured the code a bit in order to support multiple instances per project.
Fixed and issue with broken shaders when one of the samplers was set to 0.
8 年前
8db09493
Merge branch 'master' into shadows
8 年前
255625f4
Added little helper to the shadow registry to set a global override for the shadow algorithm. This will disable the UI. Shader source still needs to be manually synced with this override.
8 年前
980b67d3
[gfx-shadows] First step toward adding tents pcf filters
Adding UI and placeholder shader implementation
8 年前
d82162c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
8 年前
e76929f5
Fixed tent filter enum names.
8 年前
c0b6dcd6
Removed the old shadow system.
Removed the temporary namespace ShadowExp.
8 年前
7f34a973
Added ifdef guards around Editor code to fix script compile errors when building a player.
8 年前
712ff1d3
Merge pull request #228 from Unity-Technologies/shadows
Update Shadows system
8 年前
0d763678
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
3a226917
merged master
8 年前
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
8 年前
36fbd6cc
HDRenderPipeline: Relink enable shadow option + add test shadow scene
8 年前
72659709
Merge pull request #258 from Unity-Technologies/Update-shadow
Re-enable shadow debug
8 年前
f5f6d525
HDRenderPipeline: Fix shadow debug menu (was not working after shadow merge)
8 年前
8a03f18c
Merge pull request #260 from Unity-Technologies/Fix-shadow-debug-menu
HDRenderPipeline: Fix shadow debug menu (was not working after shadow merge)
8 年前
1996704d
Fixed hardcoded shadow resource path incorrectly handling out of bounds cases.
Fixed directional lights being subject to shadow distance calculations.
Fixed errors when having empty cascades.
8 年前
622d6403
Fixed shadow priority sort being inverted.
8 年前
8eef028b
merged master
8 年前
beaf6e75
Modified moment based shadow maps to always use [0;1] z.
8 年前
ad3d47b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
e5738ffb
Roll back to 8 SSS profiles since our PS4 impl. doesn't support arrays of size 1024
8 年前
81876b50
Added shadow cascade settings to additional light data.
8 年前
e7d27153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
b09d5f72
- Cleaned up CommonSettings from Cascaded parameters which are now in the light.
- Cleaned up some now useless code in the init code of shadow system
- Split ShadowSettings struct into two different parts. One for the init and the other for the per frame setup
- Cleaned up HDRenderPipeline a bit (mostly moving logic stuff from the asset to the instance itself)
8 年前
dda281fd
Merge branch 'master' into classicDeferredMobile
8 年前
0fef8e78
Added cascadeCount API to AdditionalLightData
8 年前
85744e59
Local merge
8 年前
36baac01
Revert "Local merge"
This reverts commit 05f9d2b94ae1d3a5f3e707ba4ad677e700a6fc55, reversing
changes made to f491bb59591c78736427ca92d2067f445f1630c5.
8 年前
9c290707
merge changes from remote to local branch
8 年前
db3ff271
Merge pull request #285 from Unity-Technologies/Branch_CommonSettingCleanup
Branch commonsettingcleanup
8 年前
8be7d43d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-framework
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
8 年前
8db13baa
Refactored shadow map debug views. Now ShadowMap implementation is responsible for display.
8 年前
e20b9e23
Removed Material from Shadow Debug API (it's now held by the shadow system)
8 年前
70b0ab1e
User can now display shadow map of the currently selected light.
8 年前
c4442bb9
Renamed shadow debug API based on feedback and added the slice parameter.
8 年前
c6828cd2
Implemented variance shadow specific debug shader.
8 年前
fb10c3b0
Merge pull request #292 from Unity-Technologies/Branch_DebugMenu2
Branch debugmenu2
8 年前
8b51c69a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
2e691da9
Modified creation of shadowmap, so subclasses can override texture settings before the RTID gets created.
8 年前
0cf2dd7b
Added min/max values to the shadowmap debug drawer to control the output value range. Also added controls for the new values to the lightingdebug panel.
8 年前
acb5e6cb
rename CullingParameters -> ScriptableCullingParameters
8 年前
63a49ce7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into upstream
8 年前
8b0f6d4c
use pooling
8 年前
d070d1b8
Merge branch 'master' into Branch_Batching2
8 年前
696ae193
Fixing memory allocations
8 年前
0a7924ff
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix
8 年前
74f56073
create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere
8 年前
b1156959
[gc]Convert to pooling
8 年前
e9b3071e
Merge branch 'master' into Branch_Batching2
8 年前
a7ee1111
HDRenderPipeline: Split AdditionalLightdata into HDAdditionalLight and AdditionalShadowData
HDAdditionalLight is dedicated to the render pipeline
AdditionalShadowData is common to all render pipeline
8 年前
e9e6cf59
HDRenderPipeline: Specular color mat id is no more store as material id
- Instead of wasting one value in materialId (only 4 availabe, we reuse
the matid standard and the value in the specular), it allow to have 2
matId free.
- Optimize the code with shader features for materialID
8 年前
2b47951c
Merge pull request #314 from Unity-Technologies/Move-matId-Specular-in-Standard
Update materialId management in Lit (Optimization + one slot saved)
8 年前
5570c647
Merge branch 'master'
8 年前
3c87f2f4
Update shadow API - Use List<VisibleLight> instead of VisibleLightArray[]
8 年前
5c55ff09
Merge pull request #316 from Unity-Technologies/Update-shadow-API-to-use-Lits-VisibleLight--to-reduce-GC-pressure
Update shadow API - Use List<VisibleLight> instead of VisibleLight[]
8 年前
93a625f2
Fix function name
8 年前
1fb45557
Merge pull request #318 from EvgeniiG/hdrp_matrix
Set HDRP matrices from scripts (except shadows)
8 年前
cd024be6
Merge branch 'master' into OnTileDeferred
7 年前
b3bd2618
Camera-relative rendering WIP
7 年前
a097b170
Changed HDRP and Shadow system APIs to take command buffers instead of ScriptableRenderPipeline.
This forces client to handle Cmd Buffer management and execution. This is necessary due to the impossibility to use nested Command Buffers currently (so any API called from user land cannot create and execute a CB of its own).
7 年前
bc633985
Merge pull request #325 from Unity-Technologies/Branch_RefactoCmdBuffers
Changed HDRP and Shadow system APIs to take command buffers instead of ScriptableRenderPipeline.
7 年前
46657cba
Merge branch 'master'
7 年前
b7e36e2f
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl.meta
# Assets/TestScenes/HDTest/HDRenderLoopTest.meta
# Assets/TestScenes/HDTest/NewBatcherTest/skin.meta
7 年前
b55fb554
Avoid modifying VisibleLights
7 年前
2909c501
Merge pull request #326 from EvgeniiG/cam_rel_render
Implement camera-relative rendering
7 年前
72d87a7d
Fix CSM for camera-relative rendering and enable the latter by default
7 年前
3c1116f3
added code to bind shadow resources to compute shaders
7 年前
a9656da4
Merge branch 'master' into Branch_Batching2
7 年前
974a44f0
HDRenderPipeline: Re-introduce repeat mode for cookie for directional light and simplify code
7 年前
adf8a77d
Merge pull request #334 from Unity-Technologies/Repeat-cookie-directional-light
support Repeat cookie for directional light
7 年前
303965c0
Fixed normal bias leading to light leaking with point shadows.
7 年前
4adbf45e
Merge branch 'master' into OnTileDeferred
7 年前
23202e49
merge in OnTileDeferredBranch after merging in master to it
7 年前
4fcf88bb
Merge branch 'master' into Branch_Batching2
# Conflicts:
# ProjectSettings/ProjectVersion.txt
7 年前
a04a82ab
Merge branch 'master'
7 年前
178ae77f
Added smooth cascade transitions to cascaded shadowmaps.
7 年前
cfe40176
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugViewFixes
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForward.hlsl
7 年前
ad0fb3d8
Merge branch 'master' into Branch_Batching2
7 年前
05ca6220
Changed CachedEntry type from struct to class to avoid unnecessary copies when doing array operations.
Replaced unnecessary array copy in VectorArray class.
7 年前
0bcbf4af
Merge branch 'master' into Branch_Batching2
7 年前
876f9979
Added dithering to cascade transitions. There are now two functions to choose from, to either blend between cascades doing two fetches, or dither doing just one fetch.
Added functions to query the world space position of a shadowmap sample.
7 年前
56270c88
Merge branch 'master' into LighweightPipelineXR
7 年前
28a25cc0
merged master
7 年前
4bc93c9f
Add support to disable range attenuation and control max smoothness on light to fake sphere light
7 年前
7be53b88
Merge pull request #368 from Unity-Technologies/maxSmoothness-and-disable-range-attenuation
Add support to disable range attenuation and control max smoothness
7 年前
5e60f635
Merge branch 'master'
7 年前
4ed252e3
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-clear-coat
7 年前
39c4d3b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RenameLayeredShader
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
7 年前
024ca3bf
Failing to allocate shadow maps no longer throws an exception but just raises an error.
7 年前
726ee1ab
Merge pull request #377 from Unity-Technologies/Branch_FixShadowAtlasException
Failing to allocate shadow maps no longer throws an exception but just raises an error.
7 年前
5bf0af64
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
7d62ca8f
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
7 年前
dd5838bd
sample game delta:
-FPS Mode (Render mesh with custom FOV)
-only PCF shadows with game specific limits
-Atmosphere y-offset property
7 年前
a1133cd9
Update #includes of ShaderLibrary to new path
7 年前
05ffcc95
Merge pull request #379 from Unity-Technologies/restructuring
Restructuring
7 年前
024a70fc
Merged master.
7 年前
e0e3492b
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
a4ea9ff8
Merge branch 'master' into prepare-filtering
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
d4b9dd15
Split directional shadow resolution in a different pass to reduce VGPR pressure during tile lighting.
7 年前
19d8082a
First draft of new light editor
7 年前
2e9e7be4
Merge pull request #399 from Unity-Technologies/new-light-editor
New light editor
7 年前
dfcadd60
Merge branch 'master' into sample_game
7 年前
02239cb4
Merge pull request #398 from Unity-Technologies/Branch_DeferredDirShadow
Branch deferreddirshadow
7 年前
69c448b2
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
e56800ee
Merge branch 'master' into LightweightPipeline
# Conflicts:
7 年前
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
5a6d78c4
Update project from sratch
7 年前
cd5fd6d3
merge latest 2017.3
7 年前
2cdd3c12
Moved most of HDRP utilities to Core
7 年前
bbaee114
Merge pull request #440 from Unity-Technologies/refactor-episode-1
Refactoring: Episode 1 - The Dawn of Utilities
7 年前
78609ffc
Merge branch 'Unity-2017.3' into YibingProject
7 年前
1137cfb3
Merge pull request #441 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
df6297b3
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
7 年前
895c04b2
Improved ProfilingSample API
7 年前
0a6d3fbe
Merge pull request #443 from Unity-Technologies/profilingsample-improvements
Improved ProfilingSample API
7 年前
ed806be2
Merge branch 'Unity-2017.3' into refactor-episode-2
7 年前
ae958d8a
Merge pull request #445 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
5e3b6e01
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
7 年前
e86a361e
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
2ef7d649
merged with master
7 年前
5f970d63
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
9f87b816
Remove file path header from shader generator generated files as it depends on users folder and cause conflict
7 年前
913bffab
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Change-SSS-profile-to-16
7 年前
1e8876bf
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForwardUnlit.hlsl
7 年前
bd071d2c
Merge pull request #515 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
6ddf3f73
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
8c3d6702
Screen Space Shadows for directional light v0 (WIP)
7 年前
a2a3c47b
Add vulkan to the list of only_renderers in all the shaders
7 年前
18d42f5f
Merge pull request #524 from Unity-Technologies/vulkan
Vulkan support for scriptable renderpipe.
7 年前
b90724d4
Added MSAA support to moment based shadowmaps. Also made some optimizations to the blur compute shader.
7 年前
cffd854a
Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests
7 年前
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
06f28ec2
Merge pull request #538 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
20767512
Added programmatic control of depth clipping. Depth clipping is disabled for shadow cascades and enabled for everything else.
7 年前
1886d3d6
Merge pull request #555 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
a1929730
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Character.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/ComplexMaterial/Textures.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/0xxx.meta
7 年前
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
532e9568
fix profiling markers for C#
7 年前
220e0aff
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
f052451a
merged from master
7 年前
f940251c
Merge pull request #580 from Unity-Technologies/script_profiling_c#
fix profiling markers for C#
7 年前
e4ffdd2d
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
ee2bccb1
Merge remote-tracking branch 'refs/remotes/origin/script_profiling_c#' into cleanup-parameter-setup-compute-code
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
d1c74bcb
Merge branch 'master'
7 年前
0a60dd2a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
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 年前
5d36f104
Merged master
7 年前
9dd5e5c5
Change shader include paths to take advantage of Core being an include path now
7 年前
f53de9f7
unify only_renderers list, fix typos
7 年前
8e4b370d
Merge pull request #596 from Unity-Technologies/metal
metal fixes
7 年前
407e1d7d
Merge remote-tracking branch 'refs/remotes/origin/master' into Implement-depth-post-pass
7 年前
536372e5
Fixed shadow map creation code in the shadow framework.
7 年前
a2f65464
Merge pull request #601 from Unity-Technologies/Branch_ShadowAndSkyBugfix
Branch shadow and sky bugfix
7 年前
e84fe4b6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
87e85612
Refactor math constant defines
7 年前
b7db3ef9
Merge branch 'shader-include-paths-2'
7 年前
8ed2bde7
Refactor directional and punctual light code
7 年前
d6a58e9c
Merge pull request #594 from EvgeniiG/master
Reduce the number of dependent texture reads for SSS
7 年前
1ba061ab
Revert " Reduce the number of dependent texture reads for SSS"
7 年前
bcdbf637
Merge pull request #606 from Unity-Technologies/revert-594-master
Revert " Reduce the number of dependent texture reads for SSS"
7 年前
39cb603c
Revert "Revert " Reduce the number of dependent texture reads for SSS""
7 年前
b529a548
Merge pull request #607 from Unity-Technologies/revert-606-revert-594-master
Revert "Revert " Reduce the number of dependent texture reads for SSS""
7 年前
ed6efcd7
Merge pull request #608 from EvgeniiG/master
Refactor directional and punctual light code
7 年前
fe773302
Merge master
7 年前
39c80121
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
1308feb1
Merge branch 'feature/realtimeCubemap' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
8ee2d44f
Merge 'master'
7 年前
b6423cf9
merge
7 年前
14ac0ce2
Initial work on support assembly definition files
7 年前
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 年前
0feb39a6
HDRenderPipeline: Add xboxone support
7 年前
4b15e9fc
Merge pull request #651 from Unity-Technologies/add-xbone-one-support
Add xbone one support
7 年前
81d62eb8
Merge branch 'master'
7 年前
04b2dec6
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
7 年前
f1dbee8e
Make IShadowManager public and move material upgrader tests outside of package
7 年前
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
efa76805
added some required "using UnityEngine.Rendering" (now SRP API is not in Experimental namespace anymore)
7 年前
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
01c07354
Add versionning on additional data
7 年前
7ab47949
Merge pull request #696 from Unity-Technologies/add-versionning-on-additonal-data
Add versionning on additonal data
7 年前
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
db6f48d8
Merge branch 'master' into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs
# ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl
7 年前
2e30e761
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
87c36d52
merged with master
7 年前
4b26e012
Move all core file to subfolder CoreRP + update shader include path to CoreRP/ShaderLibrary
7 年前
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 年前
713d15c0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
7 年前
15efd9d7
Merge branch 'master' into Convert-shaderLibrary-to-half-float-support
7 年前
e239e312
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
f6f454a7
Fix issue with tessellation and shadow
7 年前
1d141127
Merge pull request #729 from Unity-Technologies/Fix-issue-with-shadow-and-tessellation-
Fix issue with tessellation and shadow
7 年前
0c9c55a9
Merge in master, with lots of fixups
Git hates merges + moves/renames.
Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager
7 年前
1f5d453d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
7 年前
ca0020dd
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/CommonSettings.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/HDRP_Test_Camera.prefab
7 年前
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
7 年前
c6543428
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances.meta
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances/Challenge-Brick.meta
7 年前
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
b9b30507
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
064d57c1
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/Common.hlsl
7 年前
c86b3214
Merge branch 'master'
7 年前
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
e2a63632
Added VERTEXID_SEMANTIC to api files. Fixed BlitCubeTextureFace shader on gles 2.0.
7 年前
ab46e660
Merge pull request #778 from Unity-Technologies/ShaderLibraryFixes
Shader library fixes on GLES 2.0.
7 年前
8324b5e9
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-light-unity-support
7 年前
7f5f1c1a
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
47eeaedf
Reduced per frame memory allocations.
7 年前
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
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 年前
42c358c5
Added Switch support for SRP sample project.
C# scripts modified to build without XR support on Switch.
7 年前
6cf5f4d4
Manually re-applied and fixed screen space shadow code after big merge of master that moved every files.
7 年前
77f9f167
Merge branch 'master'
7 年前
93c49e08
- Switched sample count to a uniform to be changed by users
- Cleaned UI
- Added a variation to disable contact shadows
7 年前
3ccf74cc
merged from master
7 年前
4bef6509
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
3b815534
Merge commit 'ccee1ef8a8d0611355aaeace2c3530b65e34dfe0' into FixFix_TestFrameworkTools
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3004_CameraMotionVector_TranslateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3005_CameraMotionVector_TranslateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3006_CameraMotionVector_RotateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3007_CameraMotionVector_RotateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3008_CameraMotionVector_RotateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3009_CameraMotionVector_FOV.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector/SinMove.cs
# Te...
7 年前
7d2031ec
Merge branch 'master'
7 年前
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
86df6636
Merge master
7 年前
5c7e1fd0
Merge pull request #809 from Unity-Technologies/Branch_ScreenSpaceShadows
Contact Shadows
7 年前
128f5158
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
ca10cd2f
Merge
7 年前
e374ee47
Shadows are now evaluated using the device projection matrices directly, making inverseZ handling in the shader unneccessary for PCF sampling.
7 年前
c8556633
Changed shadow biasing. Biasing can now use normal and light vector information to avoid artifacts.
Added:
- normal+view biasing
- light view only biasing
- per sample biasing for wide PCF filters
- corner light leaking mitigation
- defines to control what type of biasing should be enabled
- a few new UI controls in the additionalshadowdata component
Removed previous biasing controls. They won't have any effect anymore.
7 年前
f7a762c8
Fixed wrong projection inversion being used for orthographic projections.
7 年前
c51ce48c
Merged master
7 年前
cf25c602
Merge master
7 年前
4bf6ce24
Increased the default fov guard for now to handle seams for point lights.
7 年前
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
c278421b
Added new helper function to calculate a guard angle for spot and point lights that gets added to the given fov so that biasing and filtering cannot access the shadowmap outside the valid range.
7 年前
ff116711
Merge branch 'shadows-biasing' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into shadows-biasing
7 年前
f5518a7e
Limited per face information to matrices and atlas offsets to cut down on register usage.
7 年前
74b782e2
Added new parameters to control the edge leak fixup.
Agreessiveness of the fixup can be controled, and the reference vector can either be set to the normal if available or the view vector.
7 年前
a6b4b937
Set the default depth bias to 0.
7 年前
34eeceb3
Moved slice into a separate float to avoid unnecessary casting in the shader.
7 年前
ae42e524
Split shadow matrix into separate components to selectively load per face data for point lights to improve register usage.
7 年前
34443229
Separated light and cascade data loading for directional lights.
Introduced clear rect rendering to avoid clearing the entire shadowmap.
7 年前
7528e3f3
Replaced the two clear shadow passes with one using the platform far plane define.
7 年前
116379ee
Add memory RT name/information everywhere
7 年前
c5f1b40c
Merge pull request #924 from Unity-Technologies/Test-RTHandleNaming
Add RenderTarget Memory information
7 年前
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 年前
44fabb65
Merge branch 'master' into hdrp-xr-initial
7 年前
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
7 年前
301dbf72
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
7 年前
5e5e46c8
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
619cd52e
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
35560656
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
775d3f32
Optimized cascade selection code to reduce register usage.
Added additional texture size parameter to tent filters to avoid rcp calculations using up registers.
Removed unused scale parameter from directional light payloads.
7 年前
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 年前
c9b42ea6
Added cam relative offset to inverse of shadow matrix.
7 年前
070349c8
Merge branch 'master'
7 年前
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
e768893e
Merge branch 'master'
7 年前
62637d1f
Fixed out of bounds access.
7 年前
e85069ef
Added null check to handle some weird case when running tests.
7 年前
f7122de7
Padded the ShadowData struct so its a multiple of 16 bytes.
7 年前
75a06b95
Added a combined contact shadows + normal biasing pass.
Replaced shadow specific cubemap face function. The shadow system is now going to use the one from common.hlsl.
Renamed nrml to normal.
Added a few comments.
7 年前
456c6c9e
Merge branch 'shadows-biasing' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into shadows-biasing
7 年前
57ca73ef
Update all generated files
7 年前
04b933d9
merged with master
7 年前
2376836c
Merge pull request #858 from Unity-Technologies/shadows-biasing
Shadows biasing
7 年前
6626255e
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
0c54bec9
Move resources outside of resource folder
- Move all shader/material in Resources folder to CoreResource folder
- Move DisplayShadowMap.Shader out of Resources folder
- Pass needed material to Core function through parameters
- Update reflection system to take RenderPipeline resource into account
7 年前
4d0b3071
add shadow resource to renderpipeline resource
- Move shadow .shader and .compute from ShaderLibrary to Shadow folder
- Init material and compute throught SahdowAtlasInit
7 年前
b878dd91
Merge pull request #967 from Unity-Technologies/improve-resources--management
Improve resources management
7 年前
44dd9f42
Merge branch 'master' into debug-menu-refactor
7 年前
2d48e00b
Merge branch 'master'
7 年前
3ad3c7d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
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 年前
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 年前
2001df3c
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
c4e4129a
Moved Cascade and Contact shadows settings to the volume system.
7 年前
706c8fbf
Provided way of passing in values for per frame shadow update budgets.
7 年前
baa79a02
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
841f635b
Merge pull request #980 from Unity-Technologies/Branch_ShadowsInVolume
Moved Cascade and Contact shadows settings to the volume system.
7 年前
0d688467
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
d4548639
Added #pragma_only_renderers to compute shaders.
7 年前
3e5a3c18
Merge pull request #992 from Unity-Technologies/Branch_PragmaRenderersCompute
Added #pragma_only_renderers to compute shaders.
7 年前
ba0ce030
Merge branch 'master' into integrate-sg-subshaders
7 年前
c0e3d9ab
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
da540b9e
Fix minor warnings
7 年前
0a2033df
Merge upstream/master
7 年前
6f570901
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
3251dfad
Fixed cascade selection when there are less than max cascades.
7 年前
db49ba68
Changed atlasing errors to warnings.
7 年前
ab32fa26
Fix minor warnings
7 年前
1edd41cb
Fixed cascade selection when there are less than max cascades.
7 年前
ea91e707
Changed atlasing errors to warnings.
7 年前
8cc0d941
Merge SRP 2018.1
7 年前
56f21e1e
Merge remote-tracking branch 'origin/master' into LW-MaterialUpgrades
7 年前
50623c84
Merge remote-tracking branch 'origin/master' into HDRP_MaterialUpgrader
7 年前
47d42b36
Merge pull request #1 from Unity-Technologies/master
Merge from main
7 年前
7733d48a
Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile
7 年前
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
02280c4b
Fix shader warning, shadow warning and hide physical camera parameter
7 年前
34c25f1b
Merge branch 'master' into LowEndPerf
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
7 年前
ba8f60e4
Added reading the global overrides when launching shadow requests.
7 年前
f9435eae
Merge pull request #1060 from Unity-Technologies/shadows-globaloverride
Added reading the global overrides when launching shadow requests.
7 年前
cc4d54eb
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
dc7c8312
Fix shader warning, shadow warning and hide physical camera parameter
7 年前
f2d0e0d2
Merge pull request #1048 from Unity-Technologies/More-warning-fix
Fix shader warning, shadow warning and hide physical camera parameter
7 年前
e630eecd
Merge branch 'master' into LW-Bugfix
7 年前
40539650
Merge branch '2018.1' into projects/TheLastStand
7 年前
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
7 年前
720c8a19
Merge branch 'master'
7 年前
dd8b51a8
Merge branch 'master'
7 年前
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 年前
f40129d8
Fixed blending of inactive cascades.
7 年前
f5d1e46d
Merge pull request #1101 from Unity-Technologies/shadows-fixes
Fixed blending of inactive cascades.
7 年前
32641789
Enabled support for rendering into slices as the runtime supports it now.
Fixed an error in the atlasing logic.
7 年前
218a34d2
Merge pull request #1103 from Unity-Technologies/shadows-fixes
Enabled support for rendering into slices as the runtime supports it …
7 年前
c1ce89b5
Merge branch 'master' into lw/shader-optimization
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandard.shader
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandardSimpleLighting.shader
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandardTerrain.shader
7 年前
845f068a
Fixed shadow and reflection debug overlay being flipped in game view.
7 年前
f79d38be
Merge pull request #1108 from Unity-Technologies/Branch_FixOverlayDebugFlip
Fixed shadow and reflection debug overlay being flipped in game view.
7 年前
1d711357
Merge 'upstream/master'
7 年前
75cf5fa5
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
f98f82d0
Merge remote-tracking branch 'origin/LWRP' into LW-DistortionPass
7 年前
9ea8912a
Fixed handling unknown GPUShadowTypes in the shadow manager.
7 年前
27347f32
Backport pull request #1336 into 2018.1
7 年前
53b01e3a
WIP adding Switch support.
7 年前
f5303717
Revert "WIP adding Switch support."
This reverts commit 9af0c8f34d9c5f809e96bd5f5502d6ac28b1f330.
7 年前
c279dc9c
Re-added modified files for Switch without BOM.
7 年前
f1877508
Update GetRenderTargetAutoName() to support volume textures
7 年前
f8e74a10
Merge pull request #1277 from Unity-Technologies/switch_support
Switch support
7 年前
ecc9d71b
Merge remote-tracking branch 'mainrepo/master' into stacklit
7 年前
2c1c78cf
Merge branch 'master' into 2018.1-experimental
7 年前
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
7 年前
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
7 年前
91dc696c
Merge upstream/master
7 年前
4bfaa623
merge master
7 年前
c3aaee56
Merge pull request #1302 from EvgeniiG/master
Move the Volumetric Lighting system to the RTHandle system
7 年前
05ee75ca
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
e0b3d217
Merge branch 'master' into stacklit
7 年前
2fc50ce9
Fixed handling unknown GPUShadowTypes in the shadow manager.
7 年前
d1233422
Merge pull request #1331 from Unity-Technologies/shadows-fixes
Fixed handling unknown GPUShadowTypes in the shadow manager.
7 年前
466a6cc4
Revert "Fixed handling unknown GPUShadowTypes in the shadow manager."
7 年前
760ff8d0
Merge pull request #1335 from Unity-Technologies/revert-1331-shadows-fixes
Revert "Fixed handling unknown GPUShadowTypes in the shadow manager."
7 年前
6ec42823
Fixed handling unknown GPUShadowTypes in the shadow manager.
7 年前
f78c0470
Merge pull request #1336 from Unity-Technologies/shadows-fixes
Shadows fixes
7 年前
a2ee3145
Merge branch 'master' into stacklit
7 年前
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
7 年前
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
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 年前
fafb59af
Run code formatter.
7 年前
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 年前
e118502b
Misc various improvement
Add versionning on all HD asset (and correct previous way of doing it)
Add menu items for Density volume and planar reflection
Correctly do the naming for new created HD game object (Decal, scene settings...)
Change plane orientation of planar reflection from forward to up
Add new resource material: defaultHDMaterial
Do a small fix at runtime for GI (no impact)
7 年前
e2c6895a
Merge pull request #1448 from Unity-Technologies/Various-workflow-improvement
Various workflow improvement + minor fix
7 年前
51a1873e
Merge branch 'master' into update-changelog
7 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
34d3857a
Added a bool for contact shadows in lights
7 年前
eb6fe2c5
Added a bool for contact shadows in lights
7 年前
b1cc4f3e
Merge pull request #1543 from Unity-Technologies/DominantLightContactShadow
Contact Shadows for the dominant punctual light
7 年前
2fce5809
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
447b05b3
Raw PCSS import from DREAM-2018.2 project
7 年前
3072fc83
PCSS is now working
7 年前
f53d652d
Added a field to control sampleCount in the inspector
7 年前
9d62831c
Removed UI code for PR
7 年前
8120bd8f
Cleanup code and inconsistencies
7 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
f6b0b8f5
Fix shadow algorithm reserve size
7 年前
bd393bda
Merge branch 'master' into switch-support
7 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
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 年前
5bbb2099
Merge pull request #1562 from Unity-Technologies/Port-PCSS
Port PCSS shadows
7 年前
9536b3be
Merge branch 'master' into StackLit2
7 年前
e4716aba
Merge remote-tracking branch 'mainrepo/StackLit2' into StackLit2
7 年前
7bc5d1b4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
32210ac9
Merge branch 'master' into switch-support
7 年前
c08c9929
Expose shadow budget parameter in HDRP asset
7 年前
dc7e7036
Merge pull request #1586 from Unity-Technologies/ExposeShadowBudgetParameters
Expose shadow budget parameters
7 年前
fa92c52f
Merge branch 'master' into Improve-camera-relative-rendering
6 年前
a5e0fbca
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
6 年前
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
6 年前
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
6 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
615a9fa5
Disable "edgeLeakFixup" by default
It causes large banding artifacts
6 年前
ec2d7882
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
8eb9fc52
coupling HDLight-Light reset workflow
6 年前
a7c6f9bf
Fix Awake issue
6 年前
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
edbeee31
Changed version from float to int for AdditionalShadowData
6 年前
6ac4d983
Forgot FormerlySerializedAs
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
1fbde3ba
Merge pull request #1691 from Unity-Technologies/IntVersionNumberForLightData
Changed version in HDAdditionalLightData from float to int
6 年前
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
3f424739
Merge pull request #1713 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
01ba67bc
Add shadowMap16Bit support
6 年前
5c6caff1
Merge pull request #1846 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
507df163
Merge branch 'master' into lw/light-attenuation
6 年前
106a0d43
Merge branch 'hdrp/staging' into hdrp/refactor-reflectionProbe/merge-probe-editors
6 年前
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
d2258e34
Merge pull request #1665 from Unity-Technologies/fix/coupling-hdlight-workflow
Fix/coupling Light-HDLight workflow waiting for a C++ PR #70472
6 年前
f25dd24a
Merge branch 'master' into HDRP/staging
6 年前
2befab52
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
6 年前
ab8c4439
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-gcalloc
6 年前
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
e7c59a70
Resolve merge conflicts
6 年前
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
uygar
FlorentGuinier
GitHub
Evgenii Golubev
Filip Iliescu
Arnaud Carre
sebastienlagarde
Sebastien Lagarde
Julien Ignace
David Rogers
Rune Stubbe
Tim Cooper
runes
robbiesri
Felipe Lira
Peter Bay Bastian
Peter Andreasen
Thomas
Robert Srinivasiah
Mikko Strandborg
Remy
Paul Melamed
Antti Tapaninen
Frédéric Vauchelles
Raymond Graham
Mike Wuetherick
lyndon homewood
Kay Chang
John
John Parsaie
Joel de Vahl
Aleksandr Kirillov
Matt Dean
Stephane Laroche
Yao Xiaoling
Jean-François F Fortin
Antoine Lelievre
Nerites
RSlysz
egomeh
Yao Xiao Ling