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 年前
Tim Cooper
2b3f2f91
[refactor namespace]
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering.{LoopName}
8 年前
GitHub
4925d00e
Merge pull request #77 from Unity-Technologies/namespace-refactor
[refactor namespace]
8 年前
Evgenii Golubev
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
c5bf4cfb
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitSurfaceData.hlsl
8 年前
Evgenii Golubev
47bf244a
Consistently handle 'NdotL' problems
8 年前
Julien Ignace
aa1bffc3
Moved enlighten emissive RGBM stuff into EntityLighting.hlsl
8 年前
Evgenii Golubev
96c60309
Orthonormalize TBN
8 年前
GitHub
5f068671
Merge pull request #84 from Unity-Technologies/Fix-baked-lightmap-rgbm
Moved enlighten emissive RGBM stuff into EntityLighting.hlsl
8 年前
Evgenii Golubev
1272e08c
Move orthonormalization into GetSurfaceAndBuiltinData()
8 年前
GitHub
b2c7555b
Merge pull request #82 from EvgeniiG/master
Improve consistency
8 年前
sebastienlagarde
dbf04c5b
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-tesselation
8 年前
sebastienlagarde
b60bd965
HDRenderPipeline: Fix various issue with tesselatoin + depth offset
8 年前
GitHub
789af10a
Merge pull request #89 from Unity-Technologies/Add-tesselation
Add tesselation
8 年前
Evgenii Golubev
74657c39
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
886b32ec
HDRenderPipeline: update unlit shader
8 年前
GitHub
7f00e9f5
Merge pull request #96 from Unity-Technologies/Changed-transparent-opaque-Unlit-pass
Update unlit shader
8 年前
Felipe Lira
05e84b23
Merge branch 'master' into lowendmobile
8 年前
Sebastien Lagarde
e32ad29b
HDRenderPipeline: Attempt to do somerthing with velocity pass
8 年前
sebastienlagarde
3b0e1c97
HDRenderPipeline: Large refactor of all the pass attribute and varying system
8 年前
sebastienlagarde
53b5f4b3
HDRenderPipeline: Fixing a lot of compiling issue, all is now compiling
8 年前
sebastienlagarde
f0a158b3
HDRenderPipeline: Plenty of other fix - shader compiler crash with internal error for tesselation
8 年前
sebastienlagarde
097f767c
HDRenderPipeline: Fix a lot of thing, tesselation work with lit shader but fail with layeredLit + planar and triplanr doesn't work
8 年前
Sebastien Lagarde
1cc45a08
HDRenderPipeline: Push various error and warning fix
8 年前
Sebastien Lagarde
fe9b2eb8
HDRenderPipeline: Format + another set of fix with displacement map
8 年前
Sebastien Lagarde
66bb5e08
HDRenderPipeline: Fix last issue - all working!
8 年前
GitHub
531082c1
Merge pull request #98 from Unity-Technologies/Vertex-interpolator-and-tesselation-improvement
Change Vertex / attributes / Interpolator management
8 年前
Sebastien Lagarde
f4f59ad1
HDRenderPipeline: Add distance and screen adapation + backface culling
miss frustrum culling
8 年前
GitHub
9a72bdd8
Merge pull request #99 from Unity-Technologies/Improve-tessellation-efficiency
HDRenderPipeline: Add distance and screen adapation + backface culling
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 年前
Evgenii Golubev
2bfdeef3
Output diffuse lighting into a separate render target
8 年前
sebastienlagarde
b82ad07d
HDRenderPipeline: Push compiling code
8 年前
GitHub
2998dd35
Merge pull request #104 from Unity-Technologies/Add-ParallaxOcclusionMapping
Add parallax occlusion mapping (near working version)
8 年前
Evgenii Golubev
8b521e10
Merge branch 'master' into SSSSS
8 年前
Evgenii Golubev
4cf1213b
Implement the pass combining specular with diffuse and SSS
8 年前
sebastienlagarde
e25f8c19
HDRenderPipeline: Add object scale
8 年前
GitHub
297cb6ad
Merge pull request #109 from Unity-Technologies/Add-object-scale-for-tessellation
Add object scale for tessellation
8 年前
sebastienlagarde
298c7695
HDRenderPipeline: Clean some code in Tessellation
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 年前
sebastienlagarde
66834685
HDRenderPipeline: Add Layered Displacement + fix issue with sky + some clean
- HDRI reflection is flipped, but HDRI and procedural sky are flipped
each other. For now fix the HDRI sky and we will fix procedural sky
after
8 年前
GitHub
1d3fd842
Merge pull request #116 from Unity-Technologies/Add-layered-displacement
HDRenderPipeline: Add Layered Displacement + fix issue with sky + some clean
8 年前
Evgenii Golubev
269e987f
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
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
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 年前
runes
3b9f1e7d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Sebastien Lagarde
0e8d4904
HDRenderPipeline: Push another no working draft
8 年前
Sebastien Lagarde
70821b88
HDRenderPipeline: First compiling version
8 年前
GitHub
1b201c94
Merge pull request #136 from Unity-Technologies/Update-POM-+-Heightmap-behavior
Updating Layered shader
8 年前
Evgenii Golubev
c13b75bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Chman
1d022582
Merge remote-tracking branch 'refs/remotes/origin/master' into postfx-temp
8 年前
Julien Ignace
5b8bfa0c
Fix meta pass for layered shader when it needed the vertex color.
8 年前
GitHub
17bcd468
Merge pull request #145 from Unity-Technologies/Branch_FixLayeredMetaPass
Fix meta pass for layered shader when it needed the vertex color.
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 年前
Sebastien Lagarde
cc2fcd8e
HDRenderPipeline: Move calculation of CreateTangentToWorld to pixel shader
8 年前
Sebastien Lagarde
68f6880e
HDRenderPipeline: Cleanup GUI for lit and layered lit material
- reorganize attributes
- remove inputs options
- Add SkyBox/Cubemap to the project
8 年前
GitHub
554a5c02
Merge pull request #153 from Unity-Technologies/Layered-Lit-Clean-and-update-UI
Layered lit clean and ui update
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 年前
Sebastien Lagarde
4d17bef2
HDRenderPipeline: Draft about surface gradient code
8 年前
Sebastien Lagarde
14dc6caa
HDRenderPipeline: Replace tangentToWorld by the correct term worldToTangent
8 年前
Sebastien Lagarde
f1b63cc8
HDRenderPipeline: Some rename and cleanup + add few surface gradient define case
Apply WorldToTangent name even with surface gradient
8 年前
GitHub
fd4b72d5
Merge pull request #166 from Unity-Technologies/normal-surface-gradient
Add Morten's Surface Gradient support
8 年前
Evgenii Golubev
a5c5f339
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
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 年前
runes
cb7bce50
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
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 年前
Julien Ignace
88a0cfc2
Reverted wrongly commited test code.
8 年前
sebastienlagarde
722aa8b3
HDrenderPipeline: Add depth offset support in debug view depth mode
8 年前
GitHub
8b9da4f7
Merge pull request #171 from Unity-Technologies/Add-depth-offset-in-debug-view
HDrenderPipeline: Add depth offset support in debug view depth mode
8 年前
Julien Ignace
293776aa
Compilation fix on PS4: removed static keyword and reverted Cluster size to 16 because there's not enough VGPR on PS4 to compile it otherwise (to investigate)
8 年前
Julien Ignace
813ade24
Revert "Compilation fix on PS4: removed static keyword and reverted Cluster size to 16 because there's not enough VGPR on PS4 to compile it otherwise (to investigate)"
This reverts commit de20a6598ac2ad76369047a9c7de0d524054f8dc.
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 年前
runes
d83f9aa3
shader compile fixes
8 年前
runes
b5b7fad6
fixed shader compile errors
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 年前
sebastienlagarde
59346f03
HDRenderPipeline: Fix one missing modification for relative path
8 年前
Rune Stubbe
e210fc3a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
runes
f120a09b
added feature branches to lightloop
initial set of feature variant shaders
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 年前
Evgenii Golubev
c2bb7894
Remove a warning
8 年前
GitHub
77b44a0b
Merge pull request #205 from EvgeniiG/master
Refactor SSS
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 年前
Julien Ignace
a58a777f
Added first version of vertex wind and a corresponding test scene.
8 年前
GitHub
5ae8a937
Merge pull request #207 from Unity-Technologies/Branch_WindV1
Added first version of vertex wind and a corresponding test scene.
8 年前
Evgenii Golubev
9d4c2988
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Antti Tapaninen
336f484e
Merge branch 'master' into metal-ios
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 年前
Antti Tapaninen
46f1a7cf
Merge branch 'master' into metal
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 年前
Julien Ignace
526ece06
Fixed a parameter inversion in wind computation.
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 年前
GitHub
f126e949
Merge pull request #218 from Unity-Technologies/Branch_FixWindParams
Fixed a parameter inversion in wind computation.
8 年前
Evgenii Golubev
abed39d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
uygar
aa256e25
Merge branch 'master' into shadows
8 年前
Julien Ignace
83a7b5d3
Added a directionality parameter to the wind vertex animation.
8 年前
GitHub
407a1322
Merge pull request #224 from Unity-Technologies/Branch_WindImprovement
Added a directionality parameter to the wind vertex animation.
8 年前
sebastienlagarde
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 年前
GitHub
a52766f1
Merge pull request #227 from Unity-Technologies/Generate-debug-hlsl-functions
HDrenderPipeline: Generate hlsl debug functions
8 年前
sebastienlagarde
ed55ce8f
HDRenderPipeline: Clean debgu settings
- Merge debugViewMaterial with Lightingdebug mode into a DisplayDebug
(less pass)
- Clean debug code, remove useless file
8 年前
sebastienlagarde
79156ff3
HDRenderPipeline: Complete previous submit (github error)
8 年前
uygar
d82162c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
8 年前
GitHub
c53cba39
Merge pull request #229 from Unity-Technologies/Clean-debug-settings
Clean debug settings
8 年前
Evgenii Golubev
42530415
Merge branch 'master'
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 年前
Julien Ignace
25092737
Simplified (hopefully) the way we display material and lighting debug modes.
Material/Engine/Attributes/GBuffer are now clearly separated in the UI.
8 年前
GitHub
05b08a59
Merge pull request #239 from Unity-Technologies/Branch_DebugMenu
Branch debugmenu
8 年前
Sebastien Lagarde
b27de01a
Merge remote-tracking branch 'refs/remotes/origin/master' into Tetrahedron-encoding-for-normal
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 年前
Evgenii Golubev
6c224d47
Merge branch 'master'
8 年前
Tim Cooper
582adf08
Merge remote-tracking branch 'origin/master' into test-framework
8 年前
Torbjorn Laedre
5c1b2a97
Fixed bug in light transport uv->position 'unwrap'.
8 年前
Evgenii Golubev
0d763678
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Filip Iliescu
3a226917
merged master
8 年前
Arnaud Carre
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
8 年前
mmikk
82540b9f
fix normalizations
fix normalizations to match the bump framework.
8 年前
Sebastien Lagarde
811e882f
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-framework
8 年前
mmikk
9efd041c
no need to distinguish between with/without surf gradient here
no need to distinguish between with/without surf gradient here
8 年前
mmikk
9719dcc6
just fix some comments in our normal mapping stuff
just fix some comments in our normal mapping stuff
8 年前
Julien Ignace
205fb8de
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
8 年前
Thomas Hourdel
dcedff6e
Added motion vectors support; Refactored HDCamera
8 年前
Arnaud Carre
d070d1b8
Merge branch 'master' into Branch_Batching2
8 年前
GitHub
36881128
Merge pull request #303 from Unity-Technologies/movecs
Motion vectors support
8 年前
Evgenii Golubev
0a7924ff
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix
8 年前
Filip Iliescu
74f56073
create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere
8 年前
Tim Cooper
0da91305
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into reduce-gc
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
8 年前
Arnaud Carre
e9b3071e
Merge branch 'master' into Branch_Batching2
8 年前
Evgenii Golubev
df0f7a32
Add SHADERPASS_SHADOWS
8 年前
GitHub
1fb45557
Merge pull request #318 from EvgeniiG/hdrp_matrix
Set HDRP matrices from scripts (except shadows)
8 年前
Filip Iliescu
cd024be6
Merge branch 'master' into OnTileDeferred
8 年前
Evgenii Golubev
b3bd2618
Camera-relative rendering WIP
8 年前
Arnaud Carre
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
8 年前
GitHub
2909c501
Merge pull request #326 from EvgeniiG/cam_rel_render
Implement camera-relative rendering
8 年前
sebastienlagarde
02c6a152
HDRenderPipeline: Fix issue with emissive that is now HDR
8 年前
sebastienlagarde
50580dad
HDRenderPipeline: Fix issue with meta pass not using correct coordinate
7 年前
sebastienlagarde
07ba87ed
HDRenderPipeline: Fix issue with Metapass not working anymore
7 年前
Arnaud Carre
a9656da4
Merge branch 'master' into Branch_Batching2
7 年前
Thomas Hourdel
db994ece
Added support for jittered projection matrix; Fixed motion vectors
7 年前
GitHub
57ab30c0
Merge pull request #339 from Unity-Technologies/taa
Jittered Projection; Temporal Anti-aliasing support; Movecs fixes
7 年前
Evgenii Golubev
62076a23
Merge branch 'master'
7 年前
sebastienlagarde
0baf8247
Add debug view mode to know which objects have tessellation
7 年前
GitHub
af12bde1
Merge pull request #341 from Unity-Technologies/Add-tessellatoin-debug-mode
Add properties debug view mode
7 年前
Filip Iliescu
4adbf45e
Merge branch 'master' into OnTileDeferred
7 年前
Filip Iliescu
23202e49
merge in OnTileDeferredBranch after merging in master to it
7 年前
Arnaud Carre
4fcf88bb
Merge branch 'master' into Branch_Batching2
# Conflicts:
# ProjectSettings/ProjectVersion.txt
7 年前
Evgenii Golubev
a04a82ab
Merge branch 'master'
7 年前
Julien Ignace
5a6b2e9c
Various fix for debug modes:
- Debug Diffuse Lighting albedo override now works correctly for SSS materials.
- GBuffer debug now only shows GBuffer enabled material (no more forward only materials)
- Changed previous fix of PS4 crash in ShaderPassForward (it caused debug lighting for transparent objects to break).
7 年前
Julien Ignace
25d6c66e
Removed lighting computation from forward pass when doing debug. This caused crashes on PS4 due to uninitialized buffers.
7 年前
GitHub
847a8746
Merge pull request #356 from Unity-Technologies/Branch_FixCrashDebugPS4
Removed lighting computation from forward pass when doing debug. This caused crashes on PS4 due to uninitialized buffers.
7 年前
GitHub
3997328c
Merge pull request #357 from Unity-Technologies/Branch_DebugViewFixes
Various fix for debug modes:
7 年前
Arnaud Carre
ad0fb3d8
Merge branch 'master' into Branch_Batching2
7 年前
Filip Iliescu
28a25cc0
merged master
7 年前
Felipe Lira
7d62ca8f
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
7 年前
runes
dd5838bd
sample game delta:
-FPS Mode (Render mesh with custom FOV)
-only PCF shadows with game specific limits
-Atmosphere y-offset property
7 年前
Peter Bay Bastian
a1133cd9
Update #includes of ShaderLibrary to new path
7 年前
GitHub
05ffcc95
Merge pull request #379 from Unity-Technologies/restructuring
Restructuring
7 年前
Felipe Lira
024a70fc
Merged master.
7 年前
Evgenii Golubev
9ce510e5
Add additional shader passes + clean-up
7 年前
Tim Cooper
e0e3492b
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Peter Bay Bastian
a4ea9ff8
Merge branch 'master' into prepare-filtering
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Evgenii Golubev
4c563413
Merge branch 'master' of https://github.com/EvgeniiG/ScriptableRenderLoop into volumetrics
7 年前
GitHub
cac3c47f
Merge pull request #381 from EvgeniiG/master
Add additional shader passes + clean-up
7 年前
Felipe Lira
62e3c403
Merged master.
7 年前
Peter Bay Bastian
e621aacf
Convert absolute paths to relative paths in shader includes
7 年前
Evgenii Golubev
4898d174
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into volumetrics
7 年前
Felipe Lira
a2c2ce7f
Merge branch 'master' into LightweightPipeline
7 年前
Peter Andreasen
a2e029a1
merge with master + a few samplegame fixes
7 年前
sebastienlagarde
59ba33dd
HDRenderPipeline: Fix issue with wind not behaving correctly in shadows
7 年前
GitHub
0742fb7a
Merge pull request #413 from Unity-Technologies/Unity-2017.3
Merge Unity 2017.3 to master
7 年前
Felipe Lira
68c6f48c
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Julien Ignace
9c3561fd
Fixed Vertex Normal usage in vertex shaders when needed by the Wind.
7 年前
GitHub
3907ee76
Merge pull request #415 from Unity-Technologies/Branch_FixDepthPassNormal
Fixed Vertex Normal usage in vertex shaders when needed by the Wind.
7 年前
Julien Ignace
c024c281
Fixed compilation error (Disable wind for Velocity because of the known Normal Attribute issue)
7 年前
GitHub
a82f6ffc
Merge pull request #421 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
GitHub
3ed4dfec
Merge pull request #422 from Unity-Technologies/Branch_ShaderCompileFix
Fixed compilation error (Disable wind for Velocity because of the kno…
7 年前
Evgenii Golubev
73b6f981
Fix a shader compile error
7 年前
GitHub
3151b43b
Merge pull request #423 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
7a094ed8
Merge branch 'Unity-2017.3'
7 年前
Julien Ignace
825bfd84
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DepthPrepass
7 年前
Peter Andreasen
867c8236
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
sebastienlagarde
b9915628
HDRenderPipeline: First draft of support of vertex displacement
7 年前
sebastienlagarde
5d0125b2
HDRenderPipeline: Rename diplacement to vertex displacement and add a per pixel dispalcement scale (not done)
- And expose debug display properties
7 年前
GitHub
4d5e7be6
Merge pull request #433 from Unity-Technologies/Add-support-of-vertex-displacement
Add support of vertex displacement
7 年前
GitHub
c540af87
Merge pull request #434 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Julien Ignace
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
sebastienlagarde
5a6d78c4
Update project from sratch
7 年前
sebastienlagarde
cd5fd6d3
merge latest 2017.3
7 年前
Thomas
076b0d65
Cleaned up unused usings
7 年前
GitHub
89072748
Merge pull request #449 from Unity-Technologies/refactor-episode-2
Refactoring: Episode 2 - The Editor Strikes Back
7 年前
sebastienlagarde
71713559
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
GitHub
f49bc2d1
Merge pull request #450 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
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 年前
Peter Andreasen
2ef7d649
merged with master
7 年前
Sebastien Lagarde
f62941c5
Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale
7 年前
Evgenii Golubev
8d403196
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Evgenii Golubev
ea93b8f4
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
GitHub
28e0a528
Merge pull request #452 from Unity-Technologies/Distortion-cleanup-and-transparent-depth-pass
Distortion cleanup and transparent depth pass
7 年前
sebastienlagarde
cb146691
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
7 年前
sebastienlagarde
551e98f0
Refactor the UI to have vertex, pixel and tessellation displacement
- This commit will break the data that use displacement
7 年前
sebastienlagarde
af8794d4
Remove object scale from attribute/interpolator of tessellation
7 年前
Felipe Lira
5f970d63
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Julien Ignace
30bdceed
- Properly integrated fog for transparent Lit/Unlit materials.
- Added density parameter for exp fog
7 年前
GitHub
2002ee68
Merge pull request #466 from Unity-Technologies/Add-Per-Pixel-scale
Revamp of Parallax occlusoin mapping + depth offset
7 年前
Evgenii Golubev
86fe9ae4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
GitHub
6213cc0b
Merge pull request #470 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Frédéric Vauchelles
fcadaafc
Added distortion masking
7 年前
Frédéric Vauchelles
ba8dc625
(wip) Use depth to discard pixels in front of distortion object
7 年前
Frédéric Vauchelles
8706747e
Removed incorrect depth rejection related code
7 年前
Frédéric Vauchelles
c38d4aba
Use a distortion mask to discard pixels instead of depth
7 年前
GitHub
95f1f3a0
Merge pull request #474 from Unity-Technologies/feature/distortion
Feature/distortion
7 年前
GitHub
17bdc932
Merge pull request #476 from Unity-Technologies/Unity-2017.3
Merge 2017.3
7 年前
Thomas
83fb54f8
Merge branch 'Unity-2017.3' into msvo
7 年前
Felipe Lira
cdc50657
Merge branch 'Unity-2017.3' into LightweightPipeline
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Peter Andreasen
e2332032
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Sebastien Lagarde
9f87b816
Remove file path header from shader generator generated files as it depends on users folder and cause conflict
7 年前
Sebastien Lagarde
913bffab
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Change-SSS-profile-to-16
7 年前
Frédéric Vauchelles
3c9b6c67
Added builtin debug in shader pass forward unlit
7 年前
Frédéric Vauchelles
e68d82fd
Fixed comments
7 年前
GitHub
4d41fcaa
Merge pull request #496 from Unity-Technologies/feature/transparentPrepass
Feature/transparent prepass
7 年前
sebastienlagarde
522098e8
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
Frédéric Vauchelles
b37cebd5
Updated specular blending for transparents
7 年前
Julien Ignace
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 年前
Julien Ignace
f209b59a
Fixed merge error in Unlit shader and crash in SkyManager
7 年前
GitHub
b4fcde57
Merge pull request #499 from Unity-Technologies/feature/transparentSpecularBlending
Feature/transparent specular blending
7 年前
Frédéric Vauchelles
ee9f59cc
Refractor blending for transparent forward
7 年前
Julien Ignace
ded2da7e
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForward.hlsl
7 年前
GitHub
6ef6a1b3
Merge pull request #503 from Unity-Technologies/Branch_FogAndProceduralSky
Branch fog and procedural sky
7 年前
GitHub
2df3e46a
Merge branch 'Unity-2017.3' into feature/transparentSpecularBlending
7 年前
GitHub
6773024c
Merge pull request #504 from Unity-Technologies/feature/transparentSpecularBlending
Feature/transparent specular blending
7 年前
sebastienlagarde
b4ced9f3
HDRenderPipeline: Rename BlendDiffuseSpecular to ApplyBlendMode + fix some comment
7 年前
Sebastien Lagarde
7bd23e07
HDRenderPipeline: Fix fog after merge issue
7 年前
Sebastien Lagarde
55284317
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Fix-fog-rough-refraction
7 年前
sebastienlagarde
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 年前
sebastienlagarde
d33ee23f
more renaming
- Rename _EnableTransparentFog to _EnableFogOnTransparent
- Rename _BLENDMODE_ACCURATE_LIGHTING to
_BLENDMODE_PRESERVE_SPECULAR_LIGHTING
7 年前
sebastienlagarde
3a330e0f
Remove dead code
7 年前
GitHub
78752582
Merge pull request #506 from Unity-Technologies/Update-Transparent-code
Update fog and blend mode
7 年前
sebastienlagarde
5e418eb0
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Fix-blend-mode
7 年前
sebastienlagarde
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 年前
GitHub
f86a150a
Merge pull request #508 from Unity-Technologies/Fix-blend-mode
Update blend mode
7 年前
Evgenii Golubev
733171ce
Merge branch 'Unity-2017.3'
7 年前
GitHub
bd071d2c
Merge pull request #515 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Robert Srinivasiah
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
Felipe Lira
6ddf3f73
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Paul Melamed
6a8f9743
Transitional shader for system shock material upgrade
7 年前
Paul Melamed
f735f83d
Added partial support for specular setup conversion
7 年前
Paul Melamed
650a7ab4
debugging projecting a decal onto geometry
7 年前
Paul Melamed
d9dc83f4
decal projects correctly onto dbuffer albedo surface (test pattern)
7 年前
Paul Melamed
c4761310
color map and normal maps working for decals
7 年前
Paul Melamed
46c0667a
Blend decal normals in tangent space
7 年前
Paul Melamed
a5eb21ff
cleaned up decal shader, added custom UI for decal shader
7 年前
Paul Melamed
d9d7b2cb
refactor to address all comments by Sebastien in slack conversation.
7 年前
Sebastien Lagarde
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 年前
GitHub
c25c236d
Merge pull request #528 from Unity-Technologies/Refactor-LightLoop-Glue-Code
HDRenderPipeline: Refactor LightLoop glue code
7 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
GitHub
06f28ec2
Merge pull request #538 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
fcfe787e
Remove the Clamp() intrinsic
7 年前
Julien Ignace
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 年前
GitHub
84f1dbd1
Merge pull request #546 from Unity-Technologies/FixMetaPassUV
Fix meta pass uv
7 年前
GitHub
3f66af34
Merge pull request #545 from EvgeniiG/Unity-2017.3
Improve subsurface scattering
7 年前
GitHub
b6cf8abe
Merge pull request #549 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
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 年前
sebastienlagarde
bc549388
HDRenderPipeline: Update Metapass to do correct ifdef test
7 年前
GitHub
9e651ebf
Merge pull request #558 from Unity-Technologies/Update-metapass
HDRenderPipeline: Update Metapass to do correct ifdef test
7 年前
sebastienlagarde
2d587903
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Sebastien Lagarde
36f3cfd4
merge unity 2017.3
7 年前
GitHub
64affbce
Merge pull request #559 from Unity-Technologies/Unity-2017.3
Unity 2017 3
7 年前
Sebastien Lagarde
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 年前
GitHub
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 年前
Evgenii Golubev
6e30e2d6
Merge branch 'Unity-2017.3'
7 年前
GitHub
aeb0b914
Merge pull request #565 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Salvador Jacobi
4bd00346
Merge branch 'master' into organize-menu-items
7 年前
Julien Ignace
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
Evgenii Golubev
d57bf9b9
Fix tessellation frustum culling, clean and optimize
7 年前
Evgenii Golubev
b452c309
Merge branch 'Unity-2017.3'
7 年前
Julien Ignace
220e0aff
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
GitHub
72c20791
Merge pull request #570 from EvgeniiG/Unity-2017.3
Fix cracks in tessellation
7 年前
GitHub
9ef5873f
Merge pull request #571 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
fdcd7680
Merge branch 'Unity-2017.3' of https://github.com/EvgeniiG/ScriptableRenderLoop into volumetrics
7 年前
Peter Andreasen
f052451a
merged from master
7 年前
Felipe Lira
e4ffdd2d
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
GitHub
26d799fa
Merge branch 'YibingProject' into Unity-2017.3
7 年前
Sebastien Lagarde
48c698bd
Revert last wrongly merge in Unity2017.3, should not have been done...
7 年前
Sebastien Lagarde
4b16d92b
Reinit Yibing project
7 年前
Sebastien Lagarde
370d90c0
HDRenderPipeline: Fix various shader compiler warning
7 年前
Julien Ignace
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 年前
Paul Melamed
d31d3ab4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Evgenii Golubev
a3165a72
Merge branch 'master'
7 年前
Peter Andreasen
5d36f104
Merged master
7 年前
Peter Bay Bastian
9dd5e5c5
Change shader include paths to take advantage of Core being an include path now
7 年前
sebastienlagarde
43c10ade
HDRenderPipeline: Added screen position parameter to GBuffer function
- This allow to do some gbuffer encoding/decoding function with
checkboard pattern
- Update the GBuffer macro accordingly
7 年前
GitHub
4f47fa6e
Merge pull request #592 from Unity-Technologies/Add-screen-position-parameter-to-gbuffer-functions
HDRenderPipeline: Added screen position parameter to GBuffer function
7 年前
Peter Andreasen
1432e316
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Evgenii Golubev
7b797ff7
Merge branch 'master'
7 年前
Peter Bay Bastian
85e38a3c
Merge branch 'master' into shader-include-paths-2
7 年前
Evgenii Golubev
6f8ec8c3
Global rename: 'depthRaw' -> 'deviceDepth', 'depthVS -> linearDepth'
7 年前
Peter Bay Bastian
b7db3ef9
Merge branch 'shader-include-paths-2'
7 年前
GitHub
d6a58e9c
Merge pull request #594 from EvgeniiG/master
Reduce the number of dependent texture reads for SSS
7 年前
GitHub
1ba061ab
Revert " Reduce the number of dependent texture reads for SSS"
7 年前
GitHub
bcdbf637
Merge pull request #606 from Unity-Technologies/revert-594-master
Revert " Reduce the number of dependent texture reads for SSS"
7 年前
GitHub
39cb603c
Revert "Revert " Reduce the number of dependent texture reads for SSS""
7 年前
GitHub
b529a548
Merge pull request #607 from Unity-Technologies/revert-606-revert-594-master
Revert "Revert " Reduce the number of dependent texture reads for SSS""
7 年前
Frédéric Vauchelles
fe773302
Merge master
7 年前
Remy
39c80121
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Julien Ignace
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 年前
Raymond Graham
7f1a89ea
Motion Vector Support
HDRenderpipeline changes to support Motion Vector Pass.
7 年前
Raymond Graham
9cb6a586
PR feedback.
Renamed zbias function and cleaned up previous frame normal transformation
7 年前
Evgenii Golubev
0ed1b80b
Global rename
positionSS -> positionNDC
unPositionSS -> positionSS
unTileCoord -> tileCoord
ComputeScreenSpacePosition() -> ComputeNormalizedDeviceCoordinates()
7 年前
Raymond Graham
d537f99e
Small comments and cleanup
7 年前
GitHub
bd823915
Merge pull request #616 from EvgeniiG/master
Global rename
7 年前
Remy
c22205d7
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Evgenii Golubev
8ee2d44f
Merge 'master'
7 年前
Evgenii Golubev
f1b9bce7
Avoid the warning about division by 0
7 年前
Sebastien Lagarde
d6a7fcd6
HDRenderPipeline; Clean include of Color.hlsl
7 年前
Sebastien Lagarde
e5ebb9cb
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.cs
7 年前
Evgenii Golubev
228fd56b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Julien Ignace
ec66382f
- Moved GGX Convolution related files to Material/GGXConvolution
- Fixed mistake caused by wrongly generated debug cs.hlsl files
7 年前
Sebastien Lagarde
2d0640a5
Draft 2
7 年前
GitHub
01f3693c
Merge pull request #630 from Unity-Technologies/Branch_MoveGGXConvolution
Moved GGX Convolution related files to Material/GGXConvolution
7 年前
Evgenii Golubev
18cc40b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
5dd60cfa
Merge pull request #629 from EvgeniiG/master
Optimize HDRP shaders (WIP)
7 年前
sebastienlagarde
b0813df9
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
7 年前
Remy
5b6ad5e8
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Frédéric Vauchelles
6541de0b
Merge master
7 年前
Peter Andreasen
b6423cf9
merge
7 年前
runes
da8acc5e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Robert Srinivasiah
ea2646a5
Merge remote-tracking branch 'origin/master' into xr-hdrp_options
Merge conflicts had to do with moved RenderingDebugSettings and TilePass->LightLoop rename
7 年前
Felipe Lira
e45df6b6
Merge branch 'master' into LightweightPipeline
7 年前
GitHub
b04739d1
Merge pull request #641 from Unity-Technologies/Support-forward-SSS
Add support for forward sss
7 年前
Julien Ignace
256c35aa
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Paul Melamed
68425c93
Merge branch 'master' into prototype/decals
# Conflicts:
# SampleScenes/HDTest/GraphicTest/RealtimeCubemaps.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Remy
5d52724a
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Paul Melamed
dd2f4c60
Decals work with master and trunk
7 年前
Felipe Lira
711a16fb
Merge branch 'master' into LightweightPipeline
7 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
7 年前
sebastienlagarde
2f16949c
HDRenderPipeline decals: Addressed PR feedback
7 年前
GitHub
bb442f25
Merge pull request #645 from Unity-Technologies/prototype/decals
Prototype/decals
7 年前
Julien Ignace
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Evgenii Golubev
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
GitHub
56786b4c
Merge pull request #622 from Unity-Technologies/motionVectorSupport
Motion Vector Support
7 年前
Evgenii Golubev
d1b5d0f0
Fix parameter order of BFE
7 年前
Remy
a01cf7d4
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Sebastien Lagarde
1240cc88
Merge remote-tracking branch 'refs/remotes/origin/master' into Clean-SSS-code
7 年前
GitHub
10e23187
Merge branch 'master' into volume-improvements
7 年前
Evgenii Golubev
effdbb9c
Merge branch 'master'
7 年前
Julien Ignace
71f453af
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/RuntimeFilterIBL.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
7 年前
GitHub
ab1a6cff
Merge pull request #685 from EvgeniiG/master
Store light.range in lightData.size.x for box lights
7 年前
Sebastien Lagarde
657828b3
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-frameSettings
7 年前
Evgenii Golubev
7779e807
Merge branch 'master'
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
Frédéric Vauchelles
50a43207
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
sebastienlagarde
f3665ff6
Remove code for Motion vectors in GBuffer as it don't fit our need (and don't work)
- Remove ShaderConfig.s_VelocityInGbuffer
- Remove all code for velocity in GBuffer
- added enableObjectMotionVectors in FrameSettings
- Update unity_MotionVectorsParams.y (ForceNoMotion) usage
7 年前
Julien Ignace
c02d593d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/AtmosphericScattering/AtmosphericScattering.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
7 年前
Sebastien Lagarde
7d085503
Fix wrong interpretation of forceNoMotion
7 年前
GitHub
21a5d864
Merge pull request #694 from Unity-Technologies/Update-motion-vector-behavior
Update motion vector behavior
7 年前
sebastienlagarde
0491acf4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Evgenii Golubev
78563feb
Merge branch 'master'
7 年前
Frédéric Vauchelles
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Paul Melamed
db6f48d8
Merge branch 'master' into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs
# ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl
7 年前
Peter Andreasen
87c36d52
merged with master
7 年前
lyndon homewood
430ca284
Added mip debugging support
(Partially disabled pending c++ support for debug data upload.)
7 年前
lyndon homewood
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 年前
Sebastien Lagarde
298fa746
HDRenderPipeline: Fix issue with double sided and reflection probe
7 年前
GitHub
59b822e7
Merge pull request #716 from Unity-Technologies/Fix-issue-with-double-sided-and-reflection-probe
HDRenderPipeline: Fix issue with double sided and reflection probe
7 年前
Julien Ignace
f6a78dc5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
Robert Srinivasiah
0c9c55a9
Merge in master, with lots of fixups
Git hates merges + moves/renames.
Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager
7 年前
Evgenii Golubev
1f5d453d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
7 年前
Remy
ca0020dd
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/CommonSettings.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/HDRP_Test_Camera.prefab
7 年前
Paul Melamed
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
7 年前
Felipe Lira
c6543428
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances.meta
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances/Challenge-Brick.meta
7 年前
Mike Wuetherick
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
sebastienlagarde
b9b30507
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
GitHub
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
Raymond Graham
e93f78ef
Bring over Instancing support to HDRP shaders.
7 年前
lyndon homewood
064d57c1
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/Common.hlsl
7 年前
lyndon homewood
9b9d85af
Tidied up mip map debugging in shaders based on PR feedback
7 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
Sebastien Lagarde
a8ab890d
Rename SubsurfaceScattering Settings/Editor to DiffusionProfile + various file renaming/moving
7 年前
GitHub
76304378
Merge pull request #758 from Unity-Technologies/Rename-Subsurface-Profile-=---Diffusion--profile
Update Subsurface profile
7 年前
Sebastien Lagarde
e059a00a
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Sebastien Lagarde
814bb007
Decouple SSS and Transmission option
Rename EnableSSSAndTransmission as EnableSubsurfaceScattering and
EnableTransmission
Note: Disabling Transmission doesn't save the ALU if it is enabled in
the profile
+ Add supportSubsurfaceScattering in UI
+ Small cosmetic rearrangement at the beginning of lit.hlsl
7 年前
Sebastien Lagarde
eb916f23
More draft
7 年前
GitHub
afc49b99
Merge pull request #759 from Unity-Technologies/Decouple-SSS-and-transmission-option
Decouple SSS and Transmission option
7 年前
sebastienlagarde
fa1e2b55
Various renaming
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Paul Melamed
651c6311
generating decal normal to decal space matrix in vertex shader
7 年前
Paul Melamed
2479dda2
Move world to decal calculation to shaders, remove the need to set property block in c#
7 年前
Paul Melamed
bd31b3cc
Temp commit, 1st attempt at instanced decals is working.
7 年前
Sebastien Lagarde
94a0c2bd
Move back _EnableSubsurfaceScattering (must be generic and not link to a material)
7 年前
GitHub
19ff5eb4
Merge pull request #764 from Unity-Technologies/Refactor-GBuffer-with-material-feature
Rearrange GBuffer and material classification to switch to material features
7 年前
Frédéric Vauchelles
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Evgenii Golubev
2cc753e8
Define SHADERPASS for deferred lighting
7 年前
Evgenii Golubev
61786b80
Optimize material classification for uniform feature evaluation
7 年前
Sebastien Lagarde
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
lyndon homewood
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
Julien Ignace
43f6d6eb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
7 年前
GitHub
ed6465fd
Merge pull request #749 from Unity-Technologies/feature/mip-debug
Added mip debug visualisation
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
Julien Ignace
4919b7ad
Merge branch 'master' into Branch_ScreenSpaceShadows
# Conflicts:
# ScriptableRenderPipeline/Core/ShaderLibrary/Random.hlsl
# ScriptableRenderPipeline/Core/Shadow/AdditionalShadowData.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.Styles.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/DeferredDirectionalShadow.compute
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl
7 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Remy
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 年前
Evgenii Golubev
be59f96a
Address the PR feedback
7 年前
GitHub
273faca1
Merge pull request #795 from Unity-Technologies/gpuInstancingSupport
Bring over Instancing support to HDRP shaders.
7 年前
Sebastien Lagarde
1ebf9456
Merge remote-tracking branch 'refs/remotes/origin/master' into FixFix_TestFrameworkTools
7 年前
Sebastien Lagarde
a79042e5
Merge branch 'master' into pr/798
7 年前
GitHub
9d3b9c14
Merge pull request #801 from Unity-Technologies/pr/798
Pr 798
7 年前
sebastienlagarde
52ad48ce
Update tessellation factor limit to 64
7 年前
GitHub
ea509246
Merge pull request #803 from Unity-Technologies/Update-tessellation-factor-limit-to-64
Update tessellation factor limit to 64
7 年前
Remy
2289f880
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/Scripts/Editor/GraphicTests/HDRenderPipeline/DebugViewController_Editor.cs.meta
7 年前
Evgenii Golubev
7d2031ec
Merge branch 'master'
7 年前
Paul Melamed
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
Frédéric Vauchelles
86df6636
Merge master
7 年前
Julien Ignace
4172199d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScreenSpaceShadows
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/Sphere/Sphere.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.meta
7 年前
Paul Melamed
983ccfcb
Using proper instancing path.
Force decals to always draw instanced.
7 年前
Arnaud Carre
074f76bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into lwrp_batcher
7 年前
Paul Melamed
5ff3384b
fix PR comments
7 年前
GitHub
1d07f3a6
Merge pull request #808 from Unity-Technologies/prototype/decals_drawinstance
Prototype/decals drawinstance
7 年前
Remy
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Sebastien Lagarde
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
sebastienlagarde
87798701
minor comment/code on decal
7 年前
GitHub
d90fdb95
Merge pull request #815 from Unity-Technologies/minor-comment/code-on-decal
minor comment/code on decal
7 年前
Paul Melamed
e5b34b08
passing normalToWorld in material block properties
7 年前
sebastienlagarde
742c208a
Fix compilation issue with instancing and tessellation
7 年前
GitHub
783239f0
Merge pull request #819 from Unity-Technologies/Fix-compilation-issue-with-instancing-and-tessellation
Fix compilation issue with instancing and tessellation
7 年前
sebastienlagarde
26147e28
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Frédéric Vauchelles
ca10cd2f
Merge
7 年前
sebastienlagarde
d6e7f268
Fix issue to allow to build standalone player
- Fix issue with Mouse function no editor only
- Fix issue with instancing and meta pass
7 年前
GitHub
dd57b82e
Merge pull request #822 from Unity-Technologies/Fix-issue-to-build-standalone-player
Fix issue to allow to build standalone player
7 年前
sebastienlagarde
6bbe6503
HDRenderPipeline: Fix issue with instancing and double sided
7 年前
GitHub
6201fdd9
Merge pull request #831 from Unity-Technologies/Fix-issue-with-instancing-and-double-sided
HDRenderPipeline: Fix issue with instancing and double sided
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
Frédéric Vauchelles
5f6876d6
Merge branch 'master' into feature/PlanarReflection
7 年前
Evgenii Golubev
5b66c29a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into opt_ps4_2018_01
7 年前
John
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Paul Melamed
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
Paul Melamed
d83ceb71
Use material property block to set decal normal to world instanced matrix array instead of calculating it in the shader
7 年前
Sebastien Lagarde
7c20e2e8
Add instancing property view mode
7 年前
GitHub
829ff2f1
Merge pull request #838 from Unity-Technologies/Add-instancing-property-view-mode
Add instancing property view mode
7 年前
Sebastien Lagarde
b32a2d17
Merge remote-tracking branch 'refs/remotes/origin/master' into HDRP_GraphicTests
7 年前
Remy
c3c7eec1
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity
7 年前
Sebastien Lagarde
a5003db5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/PlanarReflection
7 年前
GitHub
6e5bc8c0
Merge pull request #848 from Unity-Technologies/prototype/decals_premult_alpha
Prototype/decals premult alpha
7 年前
sebastienlagarde
9354740d
HDRenderPipeline: Revert minor code done by decals PR that should have been reverted also
7 年前
sebastienlagarde
1d94ca60
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow
7 年前
John
cf25c602
Merge master
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Paul Melamed
163fdc44
Intermediate commit
7 年前
Paul Melamed
8c9541db
Filling out HTile mask in DBuffer, fix for material foldout update on decal material change
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
John
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Frédéric Vauchelles
d6743fba
Merge branch 'master' into feature/PlanarReflection
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
sebastienlagarde
ad00b16a
Merged GetPositionInput and UpdatePositionInput into one set of GetPositionInput overloads.
7 年前
Julien Ignace
19029ddd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
7 年前
sebastienlagarde
8677e68d
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
Frédéric Vauchelles
0cf502ba
Merge branch 'master' into feature/PlanarReflection
7 年前
sebastienlagarde
2bae089c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
7 年前
Evgenii Golubev
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
fe0284c8
Merge branch 'master' into HDRP_GraphicTests
7 年前
Paul Melamed
19876ed2
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
Paul Melamed
afb8df01
Cleanup PR, add decal HTile mask defines
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
GitHub
f3a96513
Merge pull request #885 from Unity-Technologies/prototype/decals_gpu_optimization
Prototype/decals gpu optimization
7 年前
sebastienlagarde
89cfaa68
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-encoding-1212to888
7 年前
Tim Cooper
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
John
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
sebastienlagarde
9afa4d41
First draft
7 年前
sebastienlagarde
8d855c64
try to compile
7 年前
John
0bfdddfc
Merge Screen Shadows
7 年前
GitHub
cf19b804
Merge pull request #887 from Unity-Technologies/Add-global-override-of-properties-for-debug
Add global override of properties for debug
7 年前
Remy
3d76f69e
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Paul Melamed
afca789b
intermediate commit, decal global properties and draw/fade distance
7 年前
Julien Ignace
950b560d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
sebastienlagarde
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
sebastienlagarde
52efe7dd
Fix issue with depth offset and velocity pass
7 年前
GitHub
e3f10134
Merge pull request #891 from Unity-Technologies/Fix-issue-with-depth-offset-and-velocity-pass
Fix issue with depth offset and velocity pass
7 年前
Frédéric Vauchelles
672c909b
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta
# Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta
7 年前
Remy
aa273d7e
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
GitHub
6157d668
Merge pull request #896 from Unity-Technologies/decals/distance_culling
Decals/distance culling
7 年前
sebastienlagarde
18cd3660
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-Menu-location-and-label
7 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
Remy
dd1d4224
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Julien Ignace
85039c4d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugFullScreen.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Alex Lian
950e29d3
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Evgenii Golubev
88a993dd
Store SSS flags inside bsdfData.materialFeatures
7 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
Julien Ignace
ffbd199e
- Fixed objects motion vectors (they were upside down)
- Fixed some warnings
7 年前
Julien Ignace
ed3443be
Revert "- Fixed objects motion vectors (they were upside down)"
This reverts commit c85edb82a9a539fba719f345433b9e2a11134046.
7 年前
Sebastien Lagarde
e2c88f24
update code
7 年前
John
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
John
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
7 年前
sebastienlagarde
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Paul Melamed
382f92e6
Some refactoring and cleanup of how decal draw data gets prepared
7 年前
Evgenii Golubev
1f7761a4
Use ShouldOutputSplitLighting() for material abstraction
7 年前
GitHub
dc676759
Merge pull request #940 from EvgeniiG/fix_sss_radius_bug
Fix SSS radius bug (+ misc changes)
7 年前
sebastienlagarde
2bc6907f
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-forward-opaque-pass
7 年前
Remy
73141567
Merge remote-tracking branch 'origin/master' into MaterialUpgrader_Upgrade
7 年前
Remy
fa829be3
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode.unity.png
7 年前
Robert Srinivasiah
7427bb14
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Sebastien Lagarde
a60a0d5a
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Sebastien Lagarde
dae7599d
Remove modification on convertSurfaceDataToBSDFData and EncodeToGBuffer
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
sebastienlagarde
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
GitHub
e8bd5bcf
Merge pull request #966 from Unity-Technologies/decals/clustered
Decals/clustered
7 年前
Julien Ignace
4b17c74c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling
# Conflicts:
# SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_10_5.mat
# SampleScenes/HDTest/Prefabs/Block_0.3x6.prefab
# SampleScenes/HDTest/Prefabs/Block_10x0.15.prefab
# SampleScenes/HDTest/Prefabs/Block_10x5.prefab
# SampleScenes/HDTest/Prefabs/Block_1x1.prefab
# SampleScenes/HDTest/Prefabs/Block_50x300.prefab
# ScriptableRenderPipeline/Core/CoreRP/Camera/CameraSwitcher.cs
7 年前
Robert Srinivasiah
6f2b52f2
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
Manual fixup of some LightLoop stuff (stereo + decals living together in light cull data)
7 年前
Remy
2001df3c
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前
sebastienlagarde
02280c4b
Fix shader warning, shadow warning and hide physical camera parameter
7 年前
Aleksandr Kirillov
34c25f1b
Merge branch 'master' into LowEndPerf
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
7 年前
Remy
cc4d54eb
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
sebastienlagarde
dc7c8312
Fix shader warning, shadow warning and hide physical camera parameter
7 年前
GitHub
f2d0e0d2
Merge pull request #1048 from Unity-Technologies/More-warning-fix
Fix shader warning, shadow warning and hide physical camera parameter
7 年前
John Parsaie
40539650
Merge branch '2018.1' into projects/TheLastStand
7 年前
sebastienlagarde
5fd3f1bf
Fix typo in GetBakedDiffuseLigthing => GetBakedDiffuseLighting
7 年前
Felipe Lira
47a2960a
Merge branch 'master' into LW-Bugfix
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
7 年前
sebastienlagarde
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
7 年前
Evgenii Golubev
720c8a19
Merge branch 'master'
7 年前
sebastienlagarde
b9df98fe
Fix typo in GetBakedDiffuseLigthing => GetBakedDiffuseLighting
7 年前
Evgenii Golubev
dd8b51a8
Merge branch 'master'
7 年前
John Parsaie
73467192
Merge branch '2018.1' into projects/TheLastStand
7 年前
Evgenii Golubev
c20517f6
Add a stub for the volume voxelization pass
7 年前
Frédéric Vauchelles
d1dfdb4e
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# SampleScenes/HDTest/PlanarReflectionTests.unity
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebugPanel.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Julien Ignace
51790cf9
(WIP) Added debug exposure to material debug views.
7 年前
Evgenii Golubev
2202a083
Remove UnityPerCamera, introduce UnityPerView
7 年前
Evgenii Golubev
a3e9bdfc
Improve the support of orthographic rendering
7 年前
GitHub
7650c7a6
Merge pull request #1121 from EvgeniiG/master
Add local box volume support to volumetrics
7 年前
Remy
75cf5fa5
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Raymond Graham
b987da15
Merge branch '2018.1' into projects/system-shock/2018.1
7 年前
Jean-Francois Fortin
ba73a264
Created StackLit material.
7 年前
Paul Melamed
ff3bd5a3
using new texture atlas to store decal textures
7 年前
Frédéric Vauchelles
7203df22
wip Screen Space Reflection forward pass
7 年前
Frédéric Vauchelles
3b63c854
wip SSR
7 年前
Evgenii Golubev
8d663ac4
Merge upstream/master
7 年前
Felipe Lira
65fc1c54
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted2.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader10.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader11.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader12.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader13.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader14.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader15.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader16.png.meta
# ScriptableRe...
7 年前
GitHub
bc2cc021
Merge pull request #1178 from Unity-Technologies/decals/texture_atlas
Decals/texture atlas
7 年前
sebastienlagarde
2e40eff7
Merge remote-tracking branch 'refs/remotes/origin/master' into stacklit
7 年前
Evgenii Golubev
2c4bd864
Add and/or rename to legacy Unity shader variables
7 年前
Evgenii Golubev
b4708ef6
Merge upstream/master
7 年前
Frédéric Vauchelles
4bd00e90
Merge master
7 年前
GitHub
858b64ad
Merge pull request #1197 from EvgeniiG/rename_unity_per_camera
Rename UnityPerCamera CBuffer variables (and set them from C#)
7 年前
Evgenii Golubev
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Yao Xiaoling
534a3864
Remove unused shader code. Compute terrain tangent in code.
7 年前
Remy
256e6c9c
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_HiZ.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Proxy.mat.meta
# Tests/GraphicsTests/RenderPip...
7 年前
Frédéric Vauchelles
09596c67
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Stephane Laroche
61ee5830
Merge branch 'master' into stacklit
7 年前
Yao Xiaoling
10c48c2c
Implemented terrain instancing. Updated UnityInstancing.hlsl for SRP.
7 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
7 年前
sebastienlagarde
89270e64
Rename _MainDepthTexture to _CameraDepthTexture (For builtin compatibility)
Old code require to use _CameraDepthTexture name, we have change it to
MainDepthTexture a while ago because of bug due to usage of
GetTemporaryRT, as we don't use GetTemporaryRT anymore we can now come
back to the original name
7 年前
GitHub
ffbc0097
Merge pull request #1308 from Unity-Technologies/Rename-_MainDepthTexture-to-_CameraDepthTexture
Rename maindepthtexture to cameradepthtexture
7 年前
sebastienlagarde
1b094ec9
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
Evgenii Golubev
cace3d6d
Merge upstream/master
7 年前
sebastienlagarde
cc62edb1
Fix triplanar with meta pass
7 年前
GitHub
e09dc001
Merge pull request #1325 from Unity-Technologies/Fix-triplanar-for-meta-pass
Fix triplanar with meta pass
7 年前
Stephane Laroche
e0b3d217
Merge branch 'master' into stacklit
7 年前
sebastienlagarde
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
7 年前
Felipe Lira
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Felipe Lira
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Sebastien Lagarde
2ca0621d
Add scene selection pass to HDRP
For lit, lit tessellation, unlit, layeredLit, LayereLitTessellation
7 年前
Evgenii Golubev
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
dc326439
Merge pull request #1375 from Unity-Technologies/Add-scene-selection-pass-to-HDRP
Add scene selection pass to HDRP
7 年前
Sebastien Lagarde
265dfd2e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Alex Lian
0d975dea
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
Matt Dean
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
7 年前
Frédéric Vauchelles
3932faa4
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/CHANGELOG.md
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCameraFrameHistoryType.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
sebastienlagarde
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Frédéric Vauchelles
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
sebastienlagarde
ded6bbde
Homegenize code of motion vector + fix discrepency between object and camera motion blur
7 年前
sebastienlagarde
e7211667
Add comment
7 年前
GitHub
c2d39705
Merge pull request #1418 from Unity-Technologies/Update-veloicty-vector
Homegenize code of motion vector + fix discrepency between object and camera motion blur
7 年前
Chris Tchou
f37d6cf2
First pass HDRP lit vertex anim
Works, issues to fix:
screen position and view direction are not accesible in vertex shader
unlit shader needs update
7 年前
Paul Melamed
6459cbb2
mesh decals somewhat working
7 年前
Paul Melamed
ee12a498
Mesh decals working
7 年前
Chris Tchou
7777e6e0
Merge branch 'vertexAnimHDRP' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
Chris Tchou
d3bcb929
Fixes for vertex animation velocity buffer, screen position
And some refactoring
7 年前
GitHub
f4d8c338
Merge pull request #1449 from Unity-Technologies/vertexAnimHDRP2
Vertex anim HDRP
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
sebastienlagarde
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
7 年前
Oliver Schnabel
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
Stephane Laroche
7933fd8d
Merge branch 'master' into StackLit2
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
sebastienlagarde
5fd64011
Prepare NormalBuffer support in forward
7 年前
Paul Melamed
5265aacd
cleanup shader #ifdef code
7 年前
Paul Melamed
aa31195d
change names of decal #defines to reflect functionality of dbuffer passes
store scale/bias of texture atlas allocations after they have been allocated
7 年前
sebastienlagarde
6c870111
Merge branch 'master' into FalseColorMode
7 年前
GitHub
07f42589
Merge pull request #1501 from Unity-Technologies/decals/ss3_channel_mask
Decals/ss3 channel mask
7 年前
Sebastien Lagarde
4d25d4a1
Add normal buffer to directional shadow and forwar
+ add poistion input to prototype of ConvertSurfaceDataToBSDFData
7 年前
Sebastien Lagarde
0ec73e5c
Merge branch 'master' into normal-buffer-support
7 年前
GitHub
f82aef0c
Merge branch 'master' into VisualizeShadowMasks
7 年前
GitHub
84c9e15c
Merge pull request #1505 from Unity-Technologies/normal-buffer-support
Add export of normal+Roughness during depth prepass for forward
7 年前
Stephane Laroche
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
Oliver Schnabel
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
7 年前
Remy
98989fb6
Merge branch 'master' into HDRP-Tests
7 年前
Felipe Lira
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
7 年前
Thomas
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
Chris Tchou
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
sebastienlagarde
ee31a3ad
HDRP: Improve camera relative rendering precision on object
Improve camera relative rendering precision on object
- Apply camera translation on the model matrix
- Add a function GetObjectPositionWS
- User are required to always used TransformObjectToWorld or GetObjectToWorldMatrix, they should never access to UNITY_MATRIX_M
- When a user want absolute world position it must use GetAbsolutePositionWS(positionWS). positionWS is either camera relative space or absolute position depends on settings, only a call to GetAbsolutePositionWS() guarantet that we are in absolute position
7 年前
sebastienlagarde
72faf3ad
Update Velocity for consistency
7 年前
sebastienlagarde
a2e180a5
Update code to allow Macro matrix to work after PR feedback
7 年前
sebastienlagarde
c1827b93
Rename positionWS to positionRWS + update shader graph template
7 年前
Sebastien Lagarde
05575e19
Fix decal not rendered correctly
7 年前
GitHub
853ed68c
Merge pull request #1587 from Unity-Technologies/Improve-camera-relative-rendering
HDRP: Improve camera relative rendering precision on object
7 年前
Sebastien Lagarde
34ae5a69
Merge branch 'master' into ios-texture-format
7 年前
Sebastien Lagarde
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
7 年前
Antoine Lelievre
a452a9db
Merge branch 'master' into LightUnits
7 年前
GitHub
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
7 年前
Paul Melamed
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
7 年前
Remy
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
7 年前
Matt Dean
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
7 年前
Matt Dean
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
7 年前
Stephane Laroche
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
7 年前
Tim Cooper
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
7 年前
Nerites
9b69a952
Merge xrconfig branch into xrsettings
6 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
Yao Xiaoling
38856112
Fix merge.
6 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
Paul Melamed
bf15dbc1
added depth bias to mesh decals
6 年前
GitHub
0f6c468e
Merge pull request #1729 from Unity-Technologies/HDRP/decals/v2_1/depth_bias
Hdrp/decals/v2 1/depth bias
6 年前
Paul Melamed
8ebddf0c
Changed how decal projector extents are modified in the UI, to make editing more intuitive
6 年前
GitHub
a23ab980
Merge pull request #1734 from Unity-Technologies/HDRP/decals/v2_1/snap_to_grid
Hdrp/decals/v2 1/snap to grid
6 年前
GitHub
07c127ac
Merge pull request #1743 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
b3ff809b
Merge branch 'master' into tests/hdrp/distortion
6 年前
GitHub
80d748f5
Add light linking support ( #1758 )
* HDRP: Add support of light layering for forward (first draft)
TODO:
- Test instancing
- Check perf
- add an option to disable light layer support + in frameSettings
- add deferred rendering support (mean add an optional extra GBuffer)
* Add LightLinking support (version 1 - compile)
This PR add support of LightLayers feature.
To use it, setup mask renderingLayers on renderers and LightLayers on a lights. If a logical and of both give a non 0 value, the light is apply, otherwise it isn't.
This mean that by default LightLayers is 1 and RenderingLayers is 1. Then user can say LightLayers is only 2 and it will only affect renderingLayers with 2 or 3 mask value.
LightLayers require an extra GBuffer in deferred, mean it have extra bandwidth and memory cost.
LightLayers once enabled in HDRPAsset with SupportLightLayers can be control by FrameSettings. Mean a camera can enable extra RT only for an in game cinematic.
This PR refactor...
6 年前
GitHub
a2d7bf8d
Merge pull request #1759 from Unity-Technologies/Add-Light-Layers
Add light layers features
6 年前
GitHub
31e46703
Merge pull request #1761 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
be0eb3c8
Merge branch 'master' into tests/hdrp/distortion
6 年前
Julien Ignace
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
Yao Xiaoling
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
Nerites
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
GitHub
7b744594
Merge branch 'master' into xrsettings
6 年前
Sebastien Lagarde
56790568
Refactor GetBakedDiffuseLighting
- Shader code change: Rename GetBakedDiffuseLighting to ModifyBakedDiffuseLighting. This function now handle lighting model for transmission too. Lux meter debug mode is factor outisde.
- Shader code change: GetBakedDiffuseLighting is not call anymore in GBuffer or forward pass, including the ConvertSurfaceDataToBSDFData and GetPreLightData, this is done in ModifyBakedDiffuseLighting now
- Shader code change: Added a backBakeDiffuseLighting to BuiltinData to handle lighting for transmission
- Shader code change: Material must now call InitBuiltinData (Init all to zero + init bakeDiffuseLighting and backBakeDiffuseLighting ) and PostInitBuiltinData
- Update shader graph associate code
6 年前
GitHub
03616069
Merge pull request #1784 from Unity-Technologies/Improve-bakeDiffuseLighting-code
Refactor GetBakedDiffuseLighting
6 年前
GitHub
6f8854ba
Merge pull request #1786 from Unity-Technologies/HDRP/staging
Hdrp/staging
6 年前
Antoine Lelievre
71ec7369
Merge HDRP/staging
6 年前
Remy
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
6 年前
Yao Xiaoling
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
Sebastien Lagarde
2b3f449e
Fixing winding and VFACE order issue + Remove _DetViewMatrix
6 年前
GitHub
ea9baba9
Merge pull request #1859 from Unity-Technologies/Fixing-winding-and-VFACE-order-issue
Fixing winding and vface order issue
6 年前
Julien Ignace
ab8c4439
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-gcalloc
6 年前
Paul Melamed
f1d163d5
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
Yao Xiao Ling
9eecd76f
Use ApplyMeshModification instead of ApplyPreVertexModification.
6 年前
egomeh
e7c59a70
Resolve merge conflicts
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
GitHub
a6854ec4
Merge pull request #1875 from Unity-Technologies/gpu-terrain
GPU Terrain (2018.3) port to HDRP and LWRP
6 年前
egomeh
93afc87c
Merge remote-tracking branch 'origin/master' into lw/light-attenuation
6 年前
Thomas
468989ad
Merge branch 'master' into pyramid-rework
6 年前
GitHub
aae1a458
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
6 年前