sebastienlagarde
ddd7203e
HDRenderLoop: Loop now work in standalone win64 player
8 年前
sebastienlagarde
996cc98f
HDRenderLoop: Move FragInput is now global to share code + reorganise debug attributes
8 年前
sebastienlagarde
a919228a
Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL
8 年前
Julien Ignace
2d47017c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/LitData.hlsl
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/LitDebugPass.hlsl
8 年前
Evgenii Golubev
290723c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into UpdateAreaLightImpl
8 年前
Paul Demeulenaere
e7df382c
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitignore
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Editor/LitUI.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/Lit.cs
8 年前
runes
1ff2ff4b
Moved debug rendering of tile lists to separate shader pass
8 年前
sebastienlagarde
8cac0660
HDRenderLoop: Clean some formatting error + fix issue with define
8 年前
Evgenii Golubev
fc0cb9a4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into SkySystem
8 年前
Paul Demeulenaere
ab48557b
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Evgenii Golubev
2df9af84
Merge branch 'SkySystem'
8 年前
sebastienlagarde
898ec83d
HDRenderLoop: Misc fix for making cluster FPTL work, still not working
8 年前
GitHub
3560d0cf
Merge pull request #29 from Unity-Technologies/merge-FPTL-cluster
Misc fix / refactor in sky and shaders
8 年前
Julien Ignace
668f9372
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/Editor/LayeredLitUI.cs
8 年前
Sebastien Lagarde
4f89be71
HDRenderLoop: minor convention cleanup
8 年前
Sebastien Lagarde
62c01cdd
HDRenderLoop: First no working version of cluster FPTL
8 年前
Julien Ignace
c1b2cb24
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Paul Demeulenaere
f44b8fd2
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitignore
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
runes
6d7d07de
TilePass support for arealights
8 年前
runes
36e49e0d
Minor refactoring in HDRenderLoop: Renamed light types are now referred to as volumes and light models are now referred to as light categories
8 年前
sebastienlagarde
d0ebdb4a
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-lightloop
8 年前
Sebastien Lagarde
546401a2
HDRenderLoop: Version that compile and display something
8 年前
Sebastien Lagarde
1b338186
HDRenderLoop: SinglePAss work but Tile is broken...
8 年前
GitHub
8337fa69
Merge pull request #34 from Unity-Technologies/Refactor-lightloop
Refactor lightloop
8 年前
Evgenii Golubev
e7cb98c6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
462e7b4d
Merge branch 'master' into scriptablerenderloop-graphicssettings
8 年前
Paul Demeulenaere
267b0349
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Sebastien Lagarde
39c9f7ed
HDRenderLoop: First draft not working of depth pixel offset
8 年前
Sebastien Lagarde
521b51c7
HDRenderLoop: Big refactor to preprate for depthOffsetVs
8 年前
runes
0a35dbf2
Tile debugging 2.0
8 年前
GitHub
53173cc7
Merge pull request #43 from Unity-Technologies/tiledebugging2
Tile debugging 2.0
8 年前
Sebastien Lagarde
2de194b0
Merge remote-tracking branch 'refs/remotes/origin/master' into pixel-depth-offset
# Conflicts solve:
# Assets/ScriptableRenderLoop/HDRenderLoop/Debug/Resources/DebugViewMaterialGBuffer.shader
# Assets/ScriptableRenderLoop/HDRenderLoop/Debug/Resources/DebugViewTiles.shader
8 年前
Sebastien Lagarde
ef03a8a7
HDRenderLoop: Make it compile after merge
8 年前
GitHub
9690c7b7
Merge pull request #44 from Unity-Technologies/pixel-depth-offset
Prepare for depth pixel offset
8 年前
Sebastien Lagarde
5e3a413d
HDRenderLoop: Fix debugViewtiles compilation
8 年前
Sebastien Lagarde
5d839c48
HDRenderLoop: Fix depthVS issue + introduce HDCamera
8 年前
GitHub
bdc9840a
Merge pull request #45 from Unity-Technologies/Fix-depthVS
HDRenderLoop: Fix depthVS issue + introduce HDCamera
8 年前
Julien Ignace
2ec18892
Merge branch 'master' into SkyFramework
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Sky/SkyRenderer.cs
8 年前
Sebastien Lagarde
d1bf008e
HDRenderLoop: Add distortion pass control + depth offset support
8 年前
GitHub
6b8997e6
Merge pull request #46 from Unity-Technologies/Add-distortion/DepthOffset
HDRenderLoop: Add distortion pass control + depth offset support
8 年前
Evgenii Golubev
8bbe4289
Merge remote-tracking branch 'upstream/master'
8 年前
sebastienlagarde
b890244e
HDRenderLoop: Rename the directory HDRenderLoop in HDRenderPipeline
8 年前
GitHub
23f2ee44
Merge pull request #71 from Unity-Technologies/Renaming-HDRenderLoop
Renaming hdrenderloop to hd renderPipeline
8 年前
Felipe Lira
782077fb
Merge branch 'master' into lowendmobile
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
8 年前
Julien Ignace
0f63e44e
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
8 年前
Arnaud Carre
66610d8f
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
8 年前
Evgenii Golubev
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
7b7eb3b4
Fixed a number of compilation issue with PS4.
8 年前
GitHub
a04d917d
Merge pull request #92 from Unity-Technologies/Branch_fix-ps4-hdrenderloop
Fixed a number of compilation issue with PS4.
8 年前
Evgenii Golubev
74657c39
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
05e84b23
Merge branch 'master' into lowendmobile
8 年前
Sebastien Lagarde
1cc45a08
HDRenderPipeline: Push various error and warning fix
8 年前
GitHub
531082c1
Merge pull request #98 from Unity-Technologies/Vertex-interpolator-and-tesselation-improvement
Change Vertex / attributes / Interpolator management
8 年前
Julien Ignace
c83f3d4a
Merge branch 'master' into Branch_fix-ps4-hdrenderloop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Unlit/Unlit.shader
# Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/HDRISky/Resources/SkyHDRI.shader
# Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/ProceduralSky/Resources/SkyProcedural.shader
# Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/Resources/GGXConvolve.shader
8 年前
Juho Oravainen
4320bff0
Initial metal support kickoff. Tweaked shader pragma targets from 5.0 to 4.5. Added metal to only_renderers lists. Added initial platform header API/Metal.hlsl. Couple of include paths changed to absolute until a bugfix lands on Unity side.
8 年前
GitHub
2ba6f819
Merge pull request #108 from Unity-Technologies/metal
Initial macOS Metal support for HDRenderPipeline + some iOS fixes in FTPL
8 年前
Sebastien Lagarde
6c05ce51
HDRenderPipeline: Fix compil issue + discrepencey forward deferred
8 年前
GitHub
2c21b8bb
Merge pull request #111 from Unity-Technologies/Fix-Discrenpency-forward-deferred
HDRenderPipeline: Fix discrepencey forward deferred
8 年前
Evgenii Golubev
087242cd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
21be7561
Merge branch 'master' into SSSSS
8 年前
Tim Cooper
d4271c8c
Merge remote-tracking branch 'origin/master' into preview-cameras
8 年前
Tim Cooper
171302ee
Merge branch 'preview-cameras' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
Paul Demeulenaere
40290c81
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
8 年前
Julien Ignace
3fdb1fb7
Missing files
8 年前
Sebastien Lagarde
0ba2f558
HDRenderPipeline: Fix issue with cluster rendering - enable by default with tile for opaque
Thing Left:
- Make the debug mode work in forward! (important for forward only)
- In forward only, the tiled lighting doesn't work. All lights structure
are given to the shaders but is like you have no direct lighting
8 年前
GitHub
58e4eacd
Merge pull request #120 from Unity-Technologies/Enable-Cluster-rendering
Enable cluster rendering
8 年前
Tim Cooper
8ff712ff
Merge branch 'master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/ProceduralSky/ProceduralSkyRenderer.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Utilities.cs
8 年前
Arnaud Carre
2cdff1ec
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset.meta
# Assets/TestScenes/HDTest/HDRI.meta
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectSettings.asset
8 年前
Felipe Lira
be52007a
Merge branch 'master' into lowendmobile
8 年前
Evgenii Golubev
ac23a82e
Merge branch 'master' into SSSSS
8 年前
Evgenii Golubev
9fc5bc97
Fix typos
8 年前
Evgenii Golubev
0ca79425
Merge branch 'SSSSS'
8 年前
GitHub
d00136e3
Merge pull request #128 from EvgeniiG/master
Add the initial implementation of SSS
8 年前
Julien Ignace
df95d960
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs
8 年前
sebastienlagarde
b2595e70
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
sebastienlagarde
9cecdb2e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
GitHub
b702ac53
Merge pull request #129 from Unity-Technologies/Branch_DebugShadows
Branch debugshadows
8 年前
sebastienlagarde
264abb2c
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
Julien Ignace
fe794f54
- Fixed shadow map debug max slider value with the correct number of visible shadows
- Fixed the shadow debug display shader to use the full screen quad GetVertexPosition method.
8 年前
Evgenii Golubev
f43fbd7c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
62fe15a4
Refactored current debug structures to be consistent with how Shadow Debug worked and correctly split Settings and Debug Parameters
8 年前
Antti Tapaninen
8c1ebfeb
explicitly set _CameraDepthTexture precision
8 年前
GitHub
e2f52112
Merge pull request #132 from Unity-Technologies/metal
Metal
8 年前
sebastienlagarde
f3984098
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
Julien Ignace
506c1212
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
8 年前
GitHub
4a64529d
Merge pull request #130 from Unity-Technologies/Branch_DebugShadows
Debug shadow small fix
8 年前
Julien Ignace
0da32ed1
Merge branch 'master' into Branch_DebugLighting
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
runes
3b9f1e7d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Sebastien Lagarde
9db3e981
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
Evgenii Golubev
538bf3b2
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
GitHub
c66d98c1
Merge pull request #135 from Unity-Technologies/Branch_DebugLighting
Branch debuglighting
8 年前
Evgenii Golubev
c962132e
Properly capitalize "Full Screen"
8 年前
sebastienlagarde
64b996ea
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
Evgenii Golubev
c13b75bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
66d474dd
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-Blend-Mask-Tiling-param
8 年前
Chman
1d022582
Merge remote-tracking branch 'refs/remotes/origin/master' into postfx-temp
8 年前
Arnaud Carré arnaud@unity3d.com
ca6b7f62
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching.meta
# Assets/BasicRenderBatching/LightingBatching.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderLoop/HDRenderPipeline/PostProcess/Resources/Textures.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/CascadedShadowsTest.meta
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GraphicTest/Two Sided/Prefabs/Materials.meta
# Assets/TestScenes/HDTest/Leaf.meta
# Assets/TestScenes/HDTest/Leaf/GroundLeaf.meta
8 年前
Arnaud Carre
89d05b25
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
8 年前
Sebastien Lagarde
a1e0f1e9
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline
- Rename all "loop" name to "pipeline" name for FPTL/Basic/HD
- Update all include in HDRenderPipeline to match C++ #include path that
is Asset/ScriptableRenderPipeline
Caution: This PR require the new C++ code
8 年前
GitHub
f67aaaa4
Merge pull request #152 from Unity-Technologies/Rename-ScriptableRenderLoop-folder
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline (Need to update C++)
8 年前
uygar
c8a27740
Merge branch 'master' into shadows
8 年前
runes
2ce17b6c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
ff92221a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
0905d0bc
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
8 年前
Arnaud Carre
3c290788
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/TestScenes/Big
# Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Lit_Emissive_Blue.mat
8 年前
Julien Ignace
2b3c73fa
Changed the way we handle reading into the bound depth buffer.
- Now Depth buffer is not copied anymore on PS4
- On other platform, depth buffer is used only once and the copy is used as a texture in all shader that need it. Depth Buffer Render Target is no longer changed.
8 年前
GitHub
5cb0e855
Merge pull request #173 from Unity-Technologies/Branch_CopyDepthTexture
Branch copydepthtexture
8 年前
Julien Ignace
d11b8e6e
Added an option in Lighting debug to display the sky reflection probe cubemap.
8 年前
GitHub
1a16747f
Merge pull request #176 from Unity-Technologies/Branch_DebugSkyReflection
Added an option in Lighting debug to display the sky reflection probe cubemap.
8 年前
runes
84860a17
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Arnaud Carre
b38bced1
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
8 年前
runes
c445e599
Explicit tile coordinates in GetPositionInput.
~10% faster tile deferred light evaluation in compute
8 年前
Antti Tapaninen
bfd69072
Merge branch 'master' into metal-ios
8 年前
Antti Tapaninen
2cce2981
Merge branch 'master' into metal
8 年前
sebastienlagarde
ddd7d5d5
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
GitHub
86dbe5d8
Merge pull request #192 from Unity-Technologies/Update-To-relative-path
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
Rune Stubbe
e210fc3a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
runes
12d98082
fixed tile debugging dropdown
added tile classification with indirect dispatch (feature variant shaders)
added debugging mode for feature variants
8 年前
sebastienlagarde
0628ecc1
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Antti Tapaninen
764e5269
Merge branch 'master' into metal-ios
8 年前
uygar
cefe8b15
Merge branch 'master' into shadows
8 年前
Felipe Lira
557acdfd
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/LowEndMobilePipeline/TestScenes/Materials.meta
# Assets/ScriptableRenderPipeline/Editor/MaterialUpgrader.cs
# Assets/TestScenes/HDTest/GraphicTest/LayeredTessellation/Material.meta
# Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Materials.meta
8 年前
Antti Tapaninen
0574ef6b
Merge branch 'master' into metal
8 年前
Tim Cooper
c30d33b8
[Format]Reformat via format.pl to match the new conventions
8 年前
Antti Tapaninen
a261aadf
Merge branch 'master' into metal-ios
8 年前
Antti Tapaninen
06aa5d1c
Merge branch 'master' into metal
8 年前
Evgenii Golubev
9d4c2988
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Arnaud Carre
66e32153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectVersion.txt
# ProjectSettings/QualitySettings.asset
8 年前
runes
918c1797
Feature flags now also include material/gbuffer flags.
8 年前
Evgenii Golubev
ed990060
Merge from upstream
8 年前
Antti Tapaninen
101239a7
Merge branch 'master' into metal-ios
8 年前
Julien Ignace
954a22ef
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ExportSky
8 年前
Antti Tapaninen
c46cb0b5
Merge branch 'master' into metal
8 年前
vlad-andreev
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
uygar
8db09493
Merge branch 'master' into shadows
8 年前
Filip Iliescu
6e428acc
Merge branch 'metal' into classicDeferredMobile
8 年前
sebastienlagarde
ed55ce8f
HDRenderPipeline: Clean debgu settings
- Merge debugViewMaterial with Lightingdebug mode into a DisplayDebug
(less pass)
- Clean debug code, remove useless file
8 年前
GitHub
c53cba39
Merge pull request #229 from Unity-Technologies/Clean-debug-settings
Clean debug settings
8 年前
Sebastien Lagarde
4ec50247
HDRenderPipeline: Revert a small change about DebugViewMaterialGBuffer.shader
- the clean of DebugViewMaterialGBuffer was not necessary
8 年前
Evgenii Golubev
42530415
Merge branch 'master'
8 年前
Sebastien Lagarde
3185a7c5
HDRenderPipeline: Replace TILE_SIZE MACRO by GetTileSize()
8 年前
Julien Ignace
c31d6106
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.asset
8 年前
Arnaud Carre
833d6910
Merge remote-tracking branch 'refs/remotes/origin/master' into Branch_Batching2
8 年前
Sebastien Lagarde
58f36f39
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
8 年前
runes
3b96f39a
Moved tiled lighting debug to separate function so that it also works for forward.
Fixed mouse selection in tiled lighting debug.
8 年前
Evgenii Golubev
6c224d47
Merge branch 'master'
8 年前
Sebastien Lagarde
8eeef7b8
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
8 年前
Sebastien Lagarde
5769cd84
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
8 年前
Tim Cooper
582adf08
Merge remote-tracking branch 'origin/master' into test-framework
8 年前
Filip Iliescu
3a226917
merged master
8 年前
Arnaud Carre
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
8 年前
sebastienlagarde
dc6d3e84
HDRenderPipeline: Re-enable shadow atlas visualization + some clean
8 年前
GitHub
72659709
Merge pull request #258 from Unity-Technologies/Update-shadow
Re-enable shadow debug
8 年前
Sebastien Lagarde
89a7c17b
Clenaup of folders, renaming and warning fix (see details in description)
- Rename "Common" folder "Core" folder
- Move fptl specific code from common to fptl (skyhelper, shaderbase.h)
- Move hdrp specific code from common to hdrp (resource
blitcubemap.shader)
- Remove "tutorial" on basicRenderPipeline folder name
- Update path name in shader for shadow include
- Fix misc warning in shaders
8 年前
GitHub
c185048e
Merge pull request #259 from Unity-Technologies/Shadow-debug-and-cleanup
Cleanup SRP project
8 年前
Filip Iliescu
8eef028b
merged master
8 年前
David Rogers
36baac01
Revert "Local merge"
This reverts commit 05f9d2b94ae1d3a5f3e707ba4ad677e700a6fc55, reversing
changes made to f491bb59591c78736427ca92d2067f445f1630c5.
8 年前
Filip Iliescu
9c290707
merge changes from remote to local branch
8 年前