ba76c316
HDRenderLoop: Move a lot of files for better classification
8 年前
357d999e
HDRenderLoop: Add code to init texture one time at the launch of the loop
- Still need to confirm is this code is robust
- Also remove many common.hlsl include
8 年前
bfedb067
HDRenderLoop: Update Unlit material
8 年前
3ff1088c
HDRenderLoop: More misc change + try to compile meta pass (not working yet)
8 年前
3b8e0543
moved to the experimental namespace
8 年前
05769d33
HDREnderLoop: Fix various stuff - still don't compile
8 年前
e11a6cc5
HDREnderLoop: Push misc refactor
8 年前
236dada1
HDRenderLoop: Plenty of stuff + Meta pass renaming + Depth pass
- Add EnvTemplate to generate various combinaison of cube texarray and
simple cube for evaluteBSDF_env
- Rename class/file
- Introduce concept of FragInput
8 年前
f3b6f913
Merge remote-tracking branch 'refs/remotes/origin/master' into LightmapSupport
8 年前
79cd240f
HDRenderLoop: Rename metalic to mettalic
8 年前
ca67bebf
Merge pull request #5 from Unity-Technologies/LightmapSupport
Add Meta pass + Depth pass support
8 年前
00afee16
HDRenderLoop: Lot of stuffs - try to prepare for various lighting architecture
- Move and rename file
- Design for various lighting architecture
8 年前
93fd6e5e
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
89924c46
Merge pull request #7 from Unity-Technologies/ShadowMapSupport
First draft design of shadowmap
8 年前
a87df4d4
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
fd7cfe17
HDRenderLoop: Move file/create file/Rename stuff - Related to lighting and shadow
- Effort on shadow design still need to be done
8 年前
070a44dc
added include guards to hlsl codegen
8 年前
22c94004
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
f68e8b7c
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitmodules
8 年前
e3c7667f
HDRenderLoop: Renmae PositionHS to PositionCS + another pass on shadow design
8 年前
86a99676
HDRenderLoop: Fix compil error
8 年前
2c436ffd
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
e7a1bb1b
HDRenderLoop: Update to new texture abstraction everywhere
8 年前
d6e910a1
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
48fc9b85
- Properly implemented GI meta pass for Unlit shader.
- Properly re-implemented Emission GI mode for Lit/Unlit/LayeredLit shaders.
8 年前
2998b7cd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
40f9dda4
HDRenderLoop: Update for velociy buffer + several stuff/fix/refactor
-fix issue with spotAngle that have been change in the light component
- remove undesired unrachable code warning
- create a proper shader config system (previous one was nor working)
- Change concept of material gbuffer to also include lighting, remove
all lighting buffer macro, bakeDiffuseLighting now pass to encode to
gbuffer
- deferred material is now in charge of all material RT format, lighting
buffer included
- velocity buffer is independt of deferred material
- add first start of distortion
- update velocity buffer management + add velocity pass
-
8 年前
ea867c72
HDRenderLoop: Remove Shaders folder and move all files at root + rename XXXDefault.shader to XXX.shader
8 年前
f61b40c5
HDRenderLoop: Move editor thing in editor directory to be able to build a player
8 年前
996cc98f
HDRenderLoop: Move FragInput is now global to share code + reorganise debug attributes
8 年前
a919228a
Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL
8 年前
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 年前
290723c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into UpdateAreaLightImpl
8 年前
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 年前
97a2db70
HDRenderLoop: Premultiply EmissiveIntensity and EmissiveColor + few renaming
8 年前
84ff510c
Material Upgrader support first pass
Material Upgrader framework and specific implementation for Standard ->
HD Lit.
Only limited amount of properties are transfererred. More todo.
8 年前
0ad558b0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
0065b8b6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
16333450
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
102b0ab8
- Unlit shader graph node
- Plug materialID (automatically deducted from GetMatchingMaterialID)
8 年前
5b31375a
Merge branch 'MaterialUpdater' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
4f7e51fb
Split LitUI and UnlitUI with base class to share behavior with the MaterialGraph
8 年前
fc0cb9a4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into SkySystem
8 年前
59bd5b18
Merge pull request #24 from Unity-Technologies/Split-LitUI-and-UnlitUI-with-BaseClass
BaseClass for LitUI and UnlitUI
8 年前
ab48557b
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
592b2ca6
Plug UnlitGraphUI to UnlitTemplate
8 年前
d21fd305
Update Material Graph : Implicit node has been deprecated, rework this aspect for HDRenderLoop using IMayRequiresNormal/Tangent
8 年前
2df9af84
Merge branch 'SkySystem'
8 年前
80814477
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/SinglePass/SinglePass.hlsl
8 年前
668f9372
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/Editor/LayeredLitUI.cs
8 年前
9ccb7b24
Fixed LayeredLit test scene for UV3 case (data was corrupted by Vertex Tool Pro...)
8 年前
2dd27005
Merge pull request #41 from Unity-Technologies/LayeredLit
Fixed LayeredLit test scene for UV3 case (data was corrupted by Vertex Tool Pro...)
8 年前
e43aac79
- Add BakeDiffuseLightingNode
- Fix empty regex (use explicit "nothing_at_all" because it's clearer)
- Fix Require for MasterNode considering the filter value
- Rename PositionCS => PositionHS
8 年前
521b51c7
HDRenderLoop: Big refactor to preprate for depthOffsetVs
8 年前
9690c7b7
Merge pull request #44 from Unity-Technologies/pixel-depth-offset
Prepare for depth pixel offset
8 年前
2ec18892
Merge branch 'master' into SkyFramework
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Sky/SkyRenderer.cs
8 年前
8bbe4289
Merge remote-tracking branch 'upstream/master'
8 年前
b890244e
HDRenderLoop: Rename the directory HDRenderLoop in HDRenderPipeline
8 年前
23f2ee44
Merge pull request #71 from Unity-Technologies/Renaming-HDRenderLoop
Renaming hdrenderloop to hd renderPipeline
8 年前
782077fb
Merge branch 'master' into lowendmobile
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
8 年前
0f63e44e
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
8 年前
66610d8f
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
8 年前
2b3f2f91
[refactor namespace]
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering.{LoopName}
8 年前
4925d00e
Merge pull request #77 from Unity-Technologies/namespace-refactor
[refactor namespace]
8 年前
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
c5bf4cfb
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitSurfaceData.hlsl
8 年前
6521b4be
HDRenderPipeline: More rename of UnityEditor.Experimental.ScriptableRenderLoop + minor stuff
8 年前
fc2f9126
Merge remote-tracking branch 'refs/remotes/Unity-Technologies/master' into postfx-hack
8 年前
478a2e31
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
589fe428
HDRenderPipeline: More work on tesselation
8 年前
789af10a
Merge pull request #89 from Unity-Technologies/Add-tesselation
Add tesselation
8 年前
47800dae
Fixed a number of issues on PS4
- Some shaders not compiled for PS4
- Shaders testing depth when no depth buffer were bound (which works fine on DX11)
8 年前
74657c39
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
886b32ec
HDRenderPipeline: update unlit shader
8 年前
7f00e9f5
Merge pull request #96 from Unity-Technologies/Changed-transparent-opaque-Unlit-pass
Update unlit shader
8 年前
05e84b23
Merge branch 'master' into lowendmobile
8 年前
3b0e1c97
HDRenderPipeline: Large refactor of all the pass attribute and varying system
8 年前
53b5f4b3
HDRenderPipeline: Fixing a lot of compiling issue, all is now compiling
8 年前
097f767c
HDRenderPipeline: Fix a lot of thing, tesselation work with lit shader but fail with layeredLit + planar and triplanr doesn't work
8 年前
531082c1
Merge pull request #98 from Unity-Technologies/Vertex-interpolator-and-tesselation-improvement
Change Vertex / attributes / Interpolator management
8 年前
e447e133
HDRenderPipeline: Fix tessellation issue with double sided
8 年前
9b15b029
Merge pull request #101 from Unity-Technologies/Fix-for-two-sided-tessellation
HDRenderPipeline: Fix tessellation issue with double sided
8 年前
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 年前
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 年前
2ba6f819
Merge pull request #108 from Unity-Technologies/metal
Initial macOS Metal support for HDRenderPipeline + some iOS fixes in FTPL
8 年前
087242cd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
21be7561
Merge branch 'master' into SSSSS
8 年前
d4271c8c
Merge remote-tracking branch 'origin/master' into preview-cameras
8 年前
171302ee
Merge branch 'preview-cameras' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
40290c81
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
8 年前
408e09aa
HDREnderLoop: Fix cluster lighting + rename base layer to main layer
- Cluster opaque is working but cluster transparent is not working
- Change name base layer to Main layer influence
- Clean some unused code
8 年前
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 年前
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 年前
be52007a
Merge branch 'master' into lowendmobile
8 年前
8a6b2cf1
HDRenderPipeline: Update unlit shader
8 年前
28357983
Merge pull request #126 from Unity-Technologies/Update-unlit-shader
HDRenderPipeline: Update unlit shader
8 年前
a1e72bda
Merge remote-tracking branch 'origin/master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePassResources.cs
8 年前
ac23a82e
Merge branch 'master' into SSSSS
8 年前
9fc5bc97
Fix typos
8 年前
0ca79425
Merge branch 'SSSSS'
8 年前
d00136e3
Merge pull request #128 from EvgeniiG/master
Add the initial implementation of SSS
8 年前
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 年前
b2595e70
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
9cecdb2e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
3b9f1e7d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
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 年前
89d05b25
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
8 年前
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 年前
f67aaaa4
Merge pull request #152 from Unity-Technologies/Rename-ScriptableRenderLoop-folder
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline (Need to update C++)
8 年前
68f6880e
HDRenderPipeline: Cleanup GUI for lit and layered lit material
- reorganize attributes
- remove inputs options
- Add SkyBox/Cubemap to the project
8 年前
554a5c02
Merge pull request #153 from Unity-Technologies/Layered-Lit-Clean-and-update-UI
Layered lit clean and ui update
8 年前
c8a27740
Merge branch 'master' into shadows
8 年前
2ce17b6c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
e13205b5
HDRenderPipeline: Change two sided options
Remove all variant of two sided, let double sided mirror for lit
material and double sisded for unlit
8 年前
551cee1c
Merge pull request #155 from Unity-Technologies/Change-two-sided-option
HDRenderPipeline: Change two sided options
8 年前
ff92221a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
0905d0bc
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
8 年前
00cb67b6
HDRenderPipeline: Clean interface and update UnlitUI
8 年前
ba1e0e65
Merge pull request #158 from Unity-Technologies/Cleanup-of-inspectorUI-code
Cleanup and update of Lit and Unlit UI
8 年前
967eec25
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
7b4ab969
Merge branch 'master' into Branch_SceneSettings
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
8 年前
77102a68
Merge branch 'master' into shadows
8 年前
794210ad
HDRenderPipeline: Fix compil issue with normal map in object space in litMaterial
8 年前
a5c5f339
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
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 年前
cb7bce50
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
ddd7d5d5
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
86dbe5d8
Merge pull request #192 from Unity-Technologies/Update-To-relative-path
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
e210fc3a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
764e5269
Merge branch 'master' into metal-ios
8 年前
cefe8b15
Merge branch 'master' into shadows
8 年前
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 年前
c05830f9
Remove the default SSS profile
8 年前
0574ef6b
Merge branch 'master' into metal
8 年前
77b44a0b
Merge pull request #205 from EvgeniiG/master
Refactor SSS
8 年前
c30d33b8
[Format]Reformat via format.pl to match the new conventions
8 年前
a261aadf
Merge branch 'master' into metal-ios
8 年前
06aa5d1c
Merge branch 'master' into metal
8 年前
a58a777f
Added first version of vertex wind and a corresponding test scene.
8 年前
19ea7e56
Typo
8 年前
5ae8a937
Merge pull request #207 from Unity-Technologies/Branch_WindV1
Added first version of vertex wind and a corresponding test scene.
8 年前
9d4c2988
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
336f484e
Merge branch 'master' into metal-ios
8 年前
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 年前
46f1a7cf
Merge branch 'master' into metal
8 年前
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
8db09493
Merge branch 'master' into shadows
8 年前
6e428acc
Merge branch 'metal' into classicDeferredMobile
8 年前
68b2246c
HDrenderPipeline: Generate hlsl debug functions
Instead of wrtiting functions by hand user can now call generated debug
function and override thing he/she want.
8 年前
a52766f1
Merge pull request #227 from Unity-Technologies/Generate-debug-hlsl-functions
HDrenderPipeline: Generate hlsl debug functions
8 年前
ed55ce8f
HDRenderPipeline: Clean debgu settings
- Merge debugViewMaterial with Lightingdebug mode into a DisplayDebug
(less pass)
- Clean debug code, remove useless file
8 年前
79156ff3
HDRenderPipeline: Complete previous submit (github error)
8 年前
d82162c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
8 年前
c53cba39
Merge pull request #229 from Unity-Technologies/Clean-debug-settings
Clean debug settings
8 年前
5e3e7549
HDRenderPipeline: Allow Disortion to not be display in unlit
8 年前
42530415
Merge branch 'master'
8 年前
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 年前
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 年前
3a226917
merged master
8 年前
e0790c63
HDRenderPipeline: Show double sided global illumination option on lit shader
8 年前
dee59c09
Merge branch 'master' into ssao-test
8 年前
df0c1521
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/PostProcessing
8 年前
dda281fd
Merge branch 'master' into classicDeferredMobile
8 年前
85744e59
Local merge
8 年前
36baac01
Revert "Local merge"
This reverts commit 05f9d2b94ae1d3a5f3e707ba4ad677e700a6fc55, reversing
changes made to f491bb59591c78736427ca92d2067f445f1630c5.
8 年前
bc69fad2
HDRenderPipeline: Change material framework
All material (Lit, Unlit) now derive from a base class:
RenderPipelineMaterial
previously namespace was use to material name, now it is a regular class
It allow to add more easily new material or replace current one
HDRenderPipeline with introspection will execute all material method
from found RenderPipelineMaterial
The unique deferred material that we suppose is still a special case as
several code depends on it
8 年前
9c290707
merge changes from remote to local branch
8 年前
1b926dca
Merge pull request #286 from Unity-Technologies/Update-material-framework
Update material framework
8 年前
70499455
Switch to HDCamera matrices (WIP, shadows have not yet been fixed)
8 年前
205fb8de
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
8 年前
36f2d0de
Update hlsl generator for nested class and regenerate file for HD
8 年前
b81cb75f
Merge pull request #290 from Unity-Technologies/Update-hlsl-generator
Update hlsl generator for nested class and regenerate file for HD
8 年前
c7e7065b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
8 年前
8b51c69a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
d070d1b8
Merge branch 'master' into Branch_Batching2
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 年前
a311adc9
HDRenderPipeline: Remove LegacyLayered and Performancecheck of shaders code
8 年前
e9b3071e
Merge branch 'master' into Branch_Batching2
8 年前
5570c647
Merge branch 'master'
8 年前
d8386bd4
Address the PR feedback
8 年前
1fb45557
Merge pull request #318 from EvgeniiG/hdrp_matrix
Set HDRP matrices from scripts (except shadows)
8 年前
cd024be6
Merge branch 'master' into OnTileDeferred
8 年前
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 年前
2016f575
HDRenderPipeline: Move ShaderConfig.cs.hlsl to ShaderVariables.hlsl
7 年前
a04a82ab
Merge branch 'master'
7 年前
ad0fb3d8
Merge branch 'master' into Branch_Batching2
7 年前
7d46e579
"Simple" LayeredLit WIP
7 年前
9f664a03
- Removed "simple" layered lit.
- InlfuenceLayeredLit now shares UI with the Lit shader and displays it in foldouts for each layer.
7 年前
28a25cc0
merged master
7 年前
0dda7798
Merge pull request #375 from Unity-Technologies/Branch_RenameLayeredShader
LayeredLit refactor
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 年前
2d461ae1
Removed DetailMask and Emissive Mode.
- Detail mask is now always in the blue channel of the mask map
- Emissive is now EmissiveMap * EmissiveColor * lerp(1.0, Albedo, albedoAffectEmissive) with EmissiveMap being optional.
7 年前
a7bad06d
Merge pull request #392 from Unity-Technologies/Branch_LitAndLayeredImprovements
Removed DetailMask and Emissive Mode.
7 年前
f8e4f5df
Merge remote-tracking branch 'refs/remotes/origin/master' into bent-normal-and-specular-occlusion
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
a2e029a1
merge with master + a few samplegame fixes
7 年前
9e3a6300
Fixed directional shadow for transparent shaders by adding the right defines.
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 年前
076b0d65
Cleaned up unused usings
7 年前
89072748
Merge pull request #449 from Unity-Technologies/refactor-episode-2
Refactoring: Episode 2 - The Editor Strikes Back
7 年前
71713559
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
f49bc2d1
Merge pull request #450 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
a40f87a0
Clean/update for distortion + add a transparent depth prepass
- Rename All ForwardDisplayDebug to ForwardDebugDisplay
- Clean/factor code for distortion and SetEnablePass
- Add support for a RenderTransparentDepthPrepass (can be use for hair)
- Distortion pass is now consider as always a separate pass (no MRT
during particles rendering)
7 年前
2ef7d649
merged with master
7 年前
f62941c5
Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale
7 年前
81a9725b
HDRenderPipeline: Update UI to only display option for alpha test shadow/prepass with transparent
7 年前
8d403196
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
ea93b8f4
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
28e0a528
Merge pull request #452 from Unity-Technologies/Distortion-cleanup-and-transparent-depth-pass
Distortion cleanup and transparent depth pass
7 年前
cb146691
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
7 年前
5f970d63
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
30bdceed
- Properly integrated fog for transparent Lit/Unlit materials.
- Added density parameter for exp fog
7 年前
6213cc0b
Merge pull request #470 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
448737fc
Prototype for distorstion
7 年前
315455b3
(wip) distortion rejection with stencil buffer
7 年前
e533651d
Added a nullify option for distortion, based on stencil buffer usage
7 年前
88544dd5
Added distortion on ulit shader
7 年前
acca5c71
Use a multiply blend mode instead of stencil to control distortion
7 年前
9bf881d7
Write depth in distortion pass and ztest to discard pixel in front of distorted object
7 年前
5cf7b5ab
Added remapping for distortion blur
7 年前
c38d4aba
Use a distortion mask to discard pixels instead of depth
7 年前
7c7d937f
Updated UI text
7 年前
95f1f3a0
Merge pull request #474 from Unity-Technologies/feature/distortion
Feature/distortion
7 年前
17bdc932
Merge pull request #476 from Unity-Technologies/Unity-2017.3
Merge 2017.3
7 年前
fc851786
Add proper configuration of unlit.shader to render with new depth test
7 年前
6dd42b8c
Update forward only mechanism
Before we have ForwardOpaqueOnly and ForwardOpaqueDepthOnly and they
were required to be both present at the same time in sahder with regular
pass. Now pass are exclusive:
Guidelines: In deferred by default there is no opaque in forward.
However it is possible to force an opaque material to render in
forward
by using the pass "ForwardOnly". In this case the .shader should
not have "Forward" but only a "ForwardOnly" pass.
It must also have a
"DepthForwardOnly" and no "DepthOnly" pass as forward material (either
deferred or forward only rendering) have always a depth pass.
7 年前
98d141a7
Missing one file
7 年前
bd84a419
Correct wrong define used in test + fix issue with transparent keyword not reset
7 年前
fa099da4
Merge pull request #481 from Unity-Technologies/Fix-forwardOnly-unlit
Rewrite forwardOnly management
7 年前
9cacf651
Merge branch 'master' into Unity-2017.3
7 年前
9d30417f
Merge pull request #482 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
83fb54f8
Merge branch 'Unity-2017.3' into msvo
7 年前
cdc50657
Merge branch 'Unity-2017.3' into LightweightPipeline
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
e2332032
Merge remote-tracking branch 'origin/master' into sample_game
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 年前
f3fffa10
HDRenderPipeline: Fix Distortion UI (Correctly replicate attribute on shader)
- Lit/LitTessellation have distortion
- LayeredLit/LayeredLitTessellation haven't
7 年前
21c95ebc
Merge pull request #491 from Unity-Technologies/Fix-distortion-UI-issue
HDRenderPipeline: Fix Distortion UI (Correctly replicate attribute on shader)
7 年前
722dee63
(wip) Prepass for transparent
7 年前
791c45f8
Moved keyword setup in BaseLitUI.cs
7 年前
1e32285e
Renamed PreTransparent to PreRefraction
7 年前
c755942b
Fixed Lit/Distortion debug
7 年前
8814a24e
Updated shaders with transparency properties
7 年前
74ced4de
Property check on material property
7 年前
4d41fcaa
Merge pull request #496 from Unity-Technologies/feature/transparentPrepass
Feature/transparent prepass
7 年前
522098e8
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
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 年前
4a214e97
- Fixed shader compilation errors on PS4
- Fixed auto-merge mistake
- Renamed blend mode to more artists friendly names and removed SoftAdd mode.
7 年前
ce940be0
Removed distortion only for lit shader
7 年前
9ecea206
Hide blend mode popup when using refraction
7 年前
7da1ae05
Added "enable fog" parameter to layered shader.
7 年前
6ef6a1b3
Merge pull request #503 from Unity-Technologies/Branch_FogAndProceduralSky
Branch fog and procedural sky
7 年前
aa798d74
HDRenderPipeline: Remove useless _BLENDMODE_SOFT_ADD
7 年前
2df3e46a
Merge branch 'Unity-2017.3' into feature/transparentSpecularBlending
7 年前
6773024c
Merge pull request #504 from Unity-Technologies/feature/transparentSpecularBlending
Feature/transparent specular blending
7 年前
b4ced9f3
HDRenderPipeline: Rename BlendDiffuseSpecular to ApplyBlendMode + fix some comment
7 年前
cd755f87
Add _SURFACE_TYPE_TRANSPARENT keyword (so fog work with rough refraction)
7 年前
d5855c4e
Move _surface_type_transparent definition to BaseUnlitUI.cs
7 年前
7e7d8661
HDRenderPipeline: Update UI and fog test scene
7 年前
c7d467a6
Merge pull request #505 from Unity-Technologies/Fix-fog-rough-refraction
Fix fog rough refraction
7 年前
36c0ec18
Add _BLENDMODE_ACCURATE_LIGHTING keyword - change _ENABLE_FOG to _ENABLE_TRANSPARENT_FOG
- rename _LinearFogOoRange as _LinearFogOneOverRange
- add _BLENDMODE_ACCURATE_LIGHTING keyword
- change _ENABLE_FOG to _ENABLE_TRANSPARENT_FOG
- update test scene
- fix issue with refractoinMask not correct by default- rename
_LinearFogOoRange as _LinearFogOneOverRange
- add _BLENDMODE_ACCURATE_LIGHTING keyword
- change _ENABLE_FOG to _ENABLE_TRANSPARENT_FOG
- update test scene
7 年前
d33ee23f
more renaming
- Rename _EnableTransparentFog to _EnableFogOnTransparent
- Rename _BLENDMODE_ACCURATE_LIGHTING to
_BLENDMODE_PRESERVE_SPECULAR_LIGHTING
7 年前
78752582
Merge pull request #506 from Unity-Technologies/Update-Transparent-code
Update fog and blend mode
7 年前
5e418eb0
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Fix-blend-mode
7 年前
27b99b20
Update blend mode and fix issue with UI
- Change alpha blend mode to One / InvSrc alpha and the multiplication
is done in the shader. Avoid precision issue
- Make a comment ApplyBlendMode function
- Update test scene
- Fix an issue with the UI and the Popup of blend mode
7 年前
f86a150a
Merge pull request #508 from Unity-Technologies/Fix-blend-mode
Update blend mode
7 年前
733171ce
Merge branch 'Unity-2017.3'
7 年前
fed282ba
HDRenderPipeline: Fix UI with transparent
7 年前
1e05f581
Merge Unity-2017.3
7 年前
36a22fff
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FixDebugWindow
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 年前
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 年前
31f51930
HDRenderPipeline: enabled depth test by default for distortion
7 年前
55f274a4
Automatically sync double sided GI property with material's double sided property
7 年前
081fbb34
Merge pull request #525 from Unity-Technologies/feature/syncDoubleSidedGI
Automatically sync double sided GI property with material's double si…
7 年前
bb4add89
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
4287ed02
HDRenderPipeline: Split Lit and LayeredLit data file in several part to make it more readable
7 年前
3ed7e798
Merge pull request #526 from Unity-Technologies/Refactor-Lit-shader
HDRenderPipeline: Split Lit and LayeredLit data file in several part to make it more readable
7 年前
cffd854a
Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests
7 年前
935bfd9b
HDRenderPipeline: Refactor LightLoop glue code
- add a "Lighting" structure in material that replace LightAccumulator
- use it in all prototype
- Material now apply the weights
7 年前
eb9b38db
Hack for GI to handle Alpha Test correctly: Filled the hard-coded property used by the GI system to resolve opacity with our own equivalent so that GI works correctly with alpha-test. Disabled for now for Unlit because of a name conflict.
7 年前
068e18e4
Merge pull request #532 from Unity-Technologies/Branch_FixPVROpacity
Hack for GI to handle Alpha Test correctly: Filled the hard-coded pro…
7 年前
6c9a5ca6
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-refraction-cubemap-support
7 年前
5fab912f
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Refactor-LightLoop-Glue-Code
7 年前
c25c236d
Merge pull request #528 from Unity-Technologies/Refactor-LightLoop-Glue-Code
HDRenderPipeline: Refactor LightLoop glue code
7 年前
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
0bd39134
Renamed _ColorXXX properties in Unlit to _UnlitColor to avoid conflict with legacy Unity names which are required for Alpha test to work with GI.
7 年前
3eb94be0
Update files to better match unity 2017.3
7 年前
06f28ec2
Merge pull request #538 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
298835b9
Merge pull request #539 from Unity-Technologies/Branch_FixPVROpacity
Renamed _ColorXXX properties in Unlit to _UnlitColor to avoid conflic…
7 年前
3876705e
Merge pull request #540 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
aed9d43e
- Fixed meta pass to use correctly UV 2 and 3 and world space position for planar (planar still does not work though because of possible C++ dependency in the meta pass)
- Added a planar lit case in LayeredLitTest scene
7 年前
84f1dbd1
Merge pull request #546 from Unity-Technologies/FixMetaPassUV
Fix meta pass uv
7 年前
11388041
HDRenderPipeline: Add tile/scale uv control to emissive color map
7 年前
0bf4e0e7
Merge pull request #547 from Unity-Technologies/Update-Emissive-color-with-tile/scale
HDRenderPipeline: Add tile/scale uv control to emissive color map
7 年前
b6cf8abe
Merge pull request #549 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 年前
bc549388
HDRenderPipeline: Update Metapass to do correct ifdef test
7 年前
9e651ebf
Merge pull request #558 from Unity-Technologies/Update-metapass
HDRenderPipeline: Update Metapass to do correct ifdef test
7 年前
960faf23
HDRenderPipeline: Change distortion map to be 0..1 (to support LDR format)
7 年前
2d587903
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
36f3cfd4
merge unity 2017.3
7 年前
64affbce
Merge pull request #559 from Unity-Technologies/Unity-2017.3
Unity 2017 3
7 年前
69f19bc0
HDRenderPipeline: Add support of shadow mask (Disabled in 2017.3) - require C++ change
- Create clearColorAllBlack to have color with alpha channel with 0 for
clear.
- Add shadowmask and occlusion probe sampling functions
- Add various debug feature for shadow mask
- Refactor GBuffer manager
- Add SHADOWS_SHADOWMASK keyword to our various lit and debug shader
- In deferred, SHADOWS_SHADOWMASK add an extra GBuffer
- Create a BakeLightingData that contain bakeDiffuseLighting +
bakeShadowMask
- Update all lightLoop call with this new BakeLightingData struct, pass
it to EvaluateBSDF_XXX function
- Move #pragma multi_compile from .shader to pass that require it
(unsure if this save variant)
7 年前
59ecf389
Merge pull request #563 from Unity-Technologies/prepare-code-for-shadowmask
HDRenderPipeline: Add support of shadow mask (Disabled in 2017.3) - require C++ change
7 年前
6e30e2d6
Merge branch 'Unity-2017.3'
7 年前
aeb0b914
Merge pull request #565 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
4bd00346
Merge branch 'master' into organize-menu-items
7 年前
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
b452c309
Merge branch 'Unity-2017.3'
7 年前
220e0aff
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
e49a48c0
Added correct callback to handle the change of shader in our various material editors.
7 年前
fe7d9ccf
Merge pull request #569 from Unity-Technologies/Branch_FixNewShaderOnMaterial
Branch fix new shader on material
7 年前
9ef5873f
Merge pull request #571 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
f9690423
HDRenderPipeline: Update UI for AO (Remap), Distortion (ScaleBias) and UnlitColor (UVs mapping)
7 年前
25e3b085
Merge pull request #572 from Unity-Technologies/Update-various-UI
HDRenderPipeline: Update UI for AO (Remap), Distortion (ScaleBias) an…
7 年前
569840ef
Merge pull request #573 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
71d2bb2e
HDrenderPiepline: fix wrong scale and bias application on distortion texture
7 年前
6cea0d27
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
fdcd7680
Merge branch 'Unity-2017.3' of https://github.com/EvgeniiG/ScriptableRenderLoop into volumetrics
7 年前
85aac6a7
Merge pull request #577 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
f052451a
merged from master
7 年前
e4ffdd2d
Merge branch 'Unity-2017.3' into LightweightPipeline
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 年前
9dd5e5c5
Change shader include paths to take advantage of Core being an include path now
7 年前
8e92ddef
HDRenderPipeline: Remove multiply blend mode
- Multiply make it easy to do mistake (inf, negative number, NaN) and
prevent optimization like half res rendering or offscreen compositing
7 年前
54642339
HDRenderPipeline: Remove multiplicative mode 2
7 年前
36c8a29b
Merge pull request #595 from Unity-Technologies/Remove-multiply-blendmode
Remove multiply blendmode
7 年前
61e38068
HDRenderPipeline: Add support for depth postpass and backface/frontface rendering
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 年前
fa729f24
Merge pull request #597 from Unity-Technologies/Implement-depth-post-pass
HDRenderPipeline: Add support for depth postpass and backface/frontface rendering
7 年前
e84fe4b6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
eea6961b
HDRenderPipeline: Fix issue with double sided and back face rendering + move transparent prepass to prepass
7 年前
6be2053b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
b7db3ef9
Merge branch 'shader-include-paths-2'
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 年前
15b64fff
Replace SetKeyword by CoreUtils.SetKeyword
7 年前
bb9d2f89
Merge pull request #628 from Unity-Technologies/update-SetKeyword-to-UnityEngine.Experimental.RenderingCoreUtils.SetKeyword
Replace SetKeyword by CoreUtils.SetKeyword
7 年前
228fd56b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
5b6ad5e8
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
6541de0b
Merge master
7 年前
b6423cf9
merge
7 年前
ea2646a5
Merge remote-tracking branch 'origin/master' into xr-hdrp_options
Merge conflicts had to do with moved RenderingDebugSettings and TilePass->LightLoop rename
7 年前
e45df6b6
Merge branch 'master' into LightweightPipeline
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 年前
0af1be7a
HDRenderPipeline: Move Depth postpass to after transparent (solve issue) + add it to lit shader
7 年前
fa6e0a3a
Various typo fix + disable extra pass if distortion only
7 年前
81d62eb8
Merge branch 'master'
7 年前
d1768cbc
Merge pull request #654 from Unity-Technologies/Add-transparent-depth-postpass-support
HDRenderPipeline: Move Depth postpass to after transparent (solve issue) + add it to lit shader
7 年前
04b2dec6
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
7 年前
981c0965
Assembly definition files + move various Editor folders into a common Editor folder (needed for assembly definition files)
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 年前
4cd2d228
Replace all sampler macros with SAMPLER
7 年前
f080e1c3
Merge pull request #672 from EvgeniiG/master
Reduce the number of samplers used by the HDRP
7 年前
79cf2e14
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
c16681df
Merge branch 'master'
7 年前
1240cc88
Merge remote-tracking branch 'refs/remotes/origin/master' into Clean-SSS-code
7 年前
10e23187
Merge branch 'master' into volume-improvements
7 年前
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 年前
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
db6f48d8
Merge branch 'master' into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs
# ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl
7 年前
87c36d52
merged with master
7 年前
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 年前
430ca284
Added mip debugging support
(Partially disabled pending c++ support for debug data upload.)
7 年前
713d15c0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
7 年前
595016ea
Moved MipMap Debug rendering to its own mode.
Improved the visualisation of mip ratio to handle mip reduction.
Improved the mip level count visualisation now mip streaming shown more clearly in other mip debug mode
Moved common shader functions to HLSL file
7 年前
15efd9d7
Merge branch 'master' into Convert-shaderLibrary-to-half-float-support
7 年前
e239e312
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
d024e832
HDRenderPipeline: Fix issue with silouette selection
7 年前
13c269f1
Merge pull request #720 from Unity-Technologies/Fix-issue-with-silhouette
HDRenderPipeline: Fix issue with silhouette selection
7 年前
f6a78dc5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
0c9c55a9
Merge in master, with lots of fixups
Git hates merges + moves/renames.
Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager
7 年前
1f5d453d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
7 年前
ca0020dd
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/CommonSettings.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/HDRP_Test_Camera.prefab
7 年前
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 年前
f0a8ba4d
HDRenderPipeline: Move variables in correct cbuffer
7 年前
83580618
Merge pull request #745 from Unity-Technologies/Move-variable-in-correct-cbuffer
HDRenderPipeline: Move variables in correct cbuffer
7 年前
9aea34a9
HDRenderPipeline: Rename _PerMaterial to UnityPerMaterial
7 年前
cd92c7dc
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
e93f78ef
Bring over Instancing support to HDRP shaders.
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 年前
9b9d85af
Tidied up mip map debugging in shaders based on PR feedback
7 年前
c86b3214
Merge branch 'master'
7 年前
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
6e7134b5
Added motion vector support to Unlit
7 年前
b9d06aca
Merge pull request #783 from Unity-Technologies/movecs-unlit
Added motion vectors support to Unlit
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 年前
ed6465fd
Merge pull request #749 from Unity-Technologies/feature/mip-debug
Added mip debug visualisation
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 年前
77f9f167
Merge branch 'master'
7 年前
3ccf74cc
merged from master
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 年前
273faca1
Merge pull request #795 from Unity-Technologies/gpuInstancingSupport
Bring over Instancing support to HDRP shaders.
7 年前
1ebf9456
Merge remote-tracking branch 'refs/remotes/origin/master' into FixFix_TestFrameworkTools
7 年前
a79042e5
Merge branch 'master' into pr/798
7 年前
9d3b9c14
Merge pull request #801 from Unity-Technologies/pr/798
Pr 798
7 年前
2289f880
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/Scripts/Editor/GraphicTests/HDRenderPipeline/DebugViewController_Editor.cs.meta
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 年前
4172199d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScreenSpaceShadows
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/Sphere/Sphere.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.meta
7 年前
074f76bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into lwrp_batcher
7 年前
61ca3c01
Replace all toggleOff by ToggleUI [2018.1.b4 feature]
7 年前
4263f9df
Merge pull request #813 from Unity-Technologies/Replace-all-ToggleOff-by-ToggleUI--2018.1.b4-feature]
Replace all toggleoff by toggleui [2018 1 b4 feature]
7 年前
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
ca10cd2f
Merge
7 年前
c51ce48c
Merged master
7 年前
cf25c602
Merge master
7 年前
10a938eb
Add support for transparent queue priority
7 年前
4cb77cb7
Merge pull request #851 from Unity-Technologies/Add-transparent-priority-support
Add transparent priority support
7 年前
2345a375
Rename transparentQueuePriority to transparentSortPriority
+ rename GeometryLast => OpaqueLast
7 年前
7d86032b
Merge pull request #852 from Unity-Technologies/Add-transparent-priority-support
Add transparent priority support
7 年前
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
ae087b6d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
d6743fba
Merge branch 'master' into feature/PlanarReflection
7 年前
3023e8c8
Merge Screen Space Shadows
7 年前
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
19029ddd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
7 年前
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
3d4d194e
Debug display is now a multi compile option
7 年前
14257e27
Merge pull request #909 from Unity-Technologies/debug-display-as-multicompile
Debug display is now a multi compile option
7 年前
78ba9e5b
Merge master
7 年前
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
e2c88f24
update code
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 年前
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 年前
070349c8
Merge branch 'master'
7 年前
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
8a1d7457
Forward pass now control its depth test. Optimization with clip and depth prepass is only for Lit/layeredLit shader
7 年前
94301889
Move EnableMotionVectorForVertexAnimation to baseUnlit + remove motion vector from unlit.shader
7 年前
dae7599d
Remove modification on convertSurfaceDataToBSDFData and EncodeToGBuffer
7 年前
bbd2c5ef
Merge pull request #946 from Unity-Technologies/Improve-forward-opaque-pass
Remove the constrain to have a depth prepass for a forward material
7 年前
44c4a197
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
e768893e
Merge branch 'master'
7 年前
d56ea57d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
ea8ce865
First draft
7 年前
04b933d9
merged with master
7 年前
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
c4fab16a
Update shadow parameter in UI
7 年前
cb7bd10f
Merge pull request #969 from Unity-Technologies/Update-shadow-param
Update shadow parameter in UI
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 年前
8cc0d941
Merge SRP 2018.1
7 年前
003ed8ce
Add pipeline subshader tags for HD
7 年前
9630d754
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
7 年前
938ae294
Add pipeline subshader tags for HD
7 年前
2e64322b
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
7 年前
41034aa7
Merge pull request #1016 from Unity-Technologies/pr/1014
Pr 1014
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 年前
0fe793d7
Merge 2018.1
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 年前
51790cf9
(WIP) Added debug exposure to material debug views.
7 年前
35cef52a
Fixed shader include paths
7 年前
1108f618
Merge pull request #1171 from Unity-Technologies/fix-shader-include-paths
Fix shader include paths
7 年前
8d663ac4
Merge upstream/master
7 年前
5e4ad2d7
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
7 年前
e3f706be
Fix shader include case sensitiviness
7 年前
e3cbd9c5
Merge pull request #1190 from Unity-Technologies/backport/fix-shader-includes
Fix shader include case sensitiviness
7 年前
4bd00e90
Merge master
7 年前
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
53b01e3a
WIP adding Switch support.
7 年前
f5303717
Revert "WIP adding Switch support."
This reverts commit 9af0c8f34d9c5f809e96bd5f5502d6ac28b1f330.
7 年前
256e6c9c
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_HiZ.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Proxy.mat.meta
# Tests/GraphicsTests/RenderPip...
7 年前
c279dc9c
Re-added modified files for Switch without BOM.
7 年前
533beaae
Merge branch 'master' into LWRP
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 年前
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 年前
2ca0621d
Add scene selection pass to HDRP
For lit, lit tessellation, unlit, layeredLit, LayereLitTessellation
7 年前
dc326439
Merge pull request #1375 from Unity-Technologies/Add-scene-selection-pass-to-HDRP
Add scene selection pass to HDRP
7 年前
265dfd2e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
0d975dea
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
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 年前
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
7f5da648
Merge branch 'master' into sg/show-generated-code
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 年前
55b91556
Replace EmissiveIntesnity by EmissveColor HDR
Remove all occurrence of EmissiveIntensity. Emissive color is now HDR (with HDR color picker). Data need to be updated
7 年前
a3255733
Merge pull request #1445 from Unity-Technologies/Replace-EmissiveIntesnity-by-EmissveColor-HDR
Replace EmissiveIntesnity by EmissiveColor HDR
7 年前
661eacb1
HDRP: Update default value of emissiveColor
7 年前
56693471
Improve upgrade material system + Add versionning via HDRPProjectVersion.txt to project settings
7 年前
274022c0
Merge pull request #1457 from Unity-Technologies/Improve-upgrade-material-system
Improve upgrade material system + Add versionning via HDRPProjectVers…
7 年前
9f1637c0
Merge branch 'master' into decals/NoHDRP_exception
7 年前
dcbff94f
refactor shader variant per material + Add variant stripper for stacklit and selection
7 年前
d85052d9
Merge branch 'master' into StackLit2
7 年前
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
7 年前
51a1873e
Merge branch 'master' into update-changelog
7 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
1ea2f496
Merge pull request #1481 from Unity-Technologies/refactor-shader-variant-per-material
Refactor shader variant to allow stripping per material
7 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
7 年前
7933fd8d
Merge branch 'master' into StackLit2
7 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
6c870111
Merge branch 'master' into FalseColorMode
7 年前
4d25d4a1
Add normal buffer to directional shadow and forwar
+ add poistion input to prototype of ConvertSurfaceDataToBSDFData
7 年前
e06338d1
Add some comment
7 年前
84c9e15c
Merge pull request #1505 from Unity-Technologies/normal-buffer-support
Add export of normal+Roughness during depth prepass for forward
7 年前
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
7 年前
98989fb6
Merge branch 'master' into HDRP-Tests
7 年前
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).
7 年前
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)
7 年前
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
7 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
c493d0fb
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
d69fdafe
HDRP: Add support for multiple PreIntegratedFGD + updte hlsl debug number
7 年前
5a626b21
Merge pull request #1533 from Unity-Technologies/Add-support-for-multiple-PreIntegratedFGD
HDRP: Add support for multiple PreIntegratedFGD + updte hlsl debug nu…
7 年前
9db2a137
Merge branch 'master' into HDRP-Tests
7 年前
25f5aa64
Merge branch 'master' into lw/lw-pipeline-asset-inspector
7 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
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 年前
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
7 年前
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
65ea94ef
Update the material upgrader system to be per material and not per project
6 年前
b57e1824
Merge pull request #1747 from Unity-Technologies/Decal-compilation
Decal shader stripping and upgrade script + fix
6 年前
449e311f
Merge pull request #1749 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
80d748f5
Add light linking support ( #1758 )
* HDRP: Add support of light layering for forward (first draft)
TODO:
- Test instancing
- Check perf
- add an option to disable light layer support + in frameSettings
- add deferred rendering support (mean add an optional extra GBuffer)
* Add LightLinking support (version 1 - compile)
This PR add support of LightLayers feature.
To use it, setup mask renderingLayers on renderers and LightLayers on a lights. If a logical and of both give a non 0 value, the light is apply, otherwise it isn't.
This mean that by default LightLayers is 1 and RenderingLayers is 1. Then user can say LightLayers is only 2 and it will only affect renderingLayers with 2 or 3 mask value.
LightLayers require an extra GBuffer in deferred, mean it have extra bandwidth and memory cost.
LightLayers once enabled in HDRPAsset with SupportLightLayers can be control by FrameSettings. Mean a camera can enable extra RT only for an in game cinematic.
This PR refactor...
6 年前
b425d23e
Merge branch 'master' into tests/hdrp/distortion
6 年前
a2d7bf8d
Merge pull request #1759 from Unity-Technologies/Add-Light-Layers
Add light layers features
6 年前
31e46703
Merge pull request #1761 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
be0eb3c8
Merge branch 'master' into tests/hdrp/distortion
6 年前
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7b744594
Merge branch 'master' into xrsettings
6 年前
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 年前
03616069
Merge pull request #1784 from Unity-Technologies/Improve-bakeDiffuseLighting-code
Refactor GetBakedDiffuseLighting
6 年前
6f8854ba
Merge pull request #1786 from Unity-Technologies/HDRP/staging
Hdrp/staging
6 年前
71ec7369
Merge HDRP/staging
6 年前
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
6 年前
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
Sebastien Lagarde
sebastienlagarde
vlad-andreev
GitHub
Paul Demeulenaere
Julien Ignace
runes
Evgenii Golubev
joeante
Felipe Lira
Arnaud Carre
Tim Cooper
Chman
Juho Oravainen
Arnaud Carré arnaud@unity3d.com
uygar
Rune Stubbe
Antti Tapaninen
Filip Iliescu
David Rogers
Peter Bay Bastian
Peter Andreasen
Thomas
Frédéric Vauchelles
Robert Srinivasiah
Mikko Strandborg
Remy
Salvador Jacobi
Paul Melamed
Raymond Graham
lyndon homewood
Mike Wuetherick
Kay Chang
John
John Parsaie
Matt Dean
Stephane Laroche
Yao Xiaoling
Alex Lian
Chris Tchou
Oliver Schnabel
Nerites
Aleksandr Kirillov
Antoine Lelievre