Andre McGrail
|
35e631d7
|
Cherry pick from 'lw/terrain-shader-fixes' for 2018.1 PR
|
6 年前 |
|
Andre McGrail
|
b15bde9e
|
Cleaned up relative hlsl include path
|
6 年前 |
Felipe Lira
|
ba8223dd
|
Cleaned up relative hlsl include path
|
6 年前 |
|
Felipe Lira
|
5d3094de
|
Deleted LightweightUtils. Moved work to Core (partial class). Normalized files with the autoformat tool to be consistent to the convention.
|
6 年前 |
GitHub
|
a346a121
|
Merge pull request #1247 from Unity-Technologies/lw/api-review-v1
Lw/api review v1
|
6 年前 |
|
GitHub
|
231beaa3
|
Merge pull request #1269 from Unity-Technologies/LWRP
Lwrp
|
6 年前 |
sebastienlagarde
|
0ddaf44e
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
|
6 年前 |
|
sebastienlagarde
|
f5c6eec7
|
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
|
6 年前 |
Stephane Laroche
|
10f8090a
|
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
|
6 年前 |
Yao Xiaoling
|
afba3908
|
Fix LWRP terrain instancing.
|
6 年前 |
Raymond Graham
|
4e9dca70
|
Merge branch 'master' into volumetric-lighting-updates
|
6 年前 |
Evgenii Golubev
|
91dc696c
|
Merge upstream/master
|
6 年前 |
Frédéric Vauchelles
|
4bfaa623
|
merge master
|
6 年前 |
Aleksandr Kirillov
|
3beb9a60
|
Added viewDir to vertexOutput and reused the functions from Standard LWRP shader for normal and viewDirection calculation.
Added and/or fixed precision specifiers for constants.
|
6 年前 |
|
Aleksandr Kirillov
|
fbdeb254
|
Renamed splat_control to splatControl.
Optimized SplatmapMix function.
|
6 年前 |
|
Aleksandr Kirillov
|
f9292a0e
|
A bit more renaming of splat_control.
|
6 年前 |
|
Felipe Lira
|
f1650b8c
|
Fixed PS4 compiler error.
|
6 年前 |
|
GitHub
|
f7309758
|
Merge pull request #1551 from Unity-Technologies/lw/platform-fixes
Lw/platform fixes
|
6 年前 |
|
sebastienlagarde
|
7934a87a
|
Merge branch 'master' into LightUnits
|
6 年前 |
Paul Melamed
|
141afc6f
|
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
|
6 年前 |
Remy
|
540d190a
|
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
|
6 年前 |
Matt Dean
|
1b3f1ca2
|
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
|
6 年前 |
|
Matt Dean
|
1c4c0d09
|
Merge branch 'master' into sg/fix-dielectric-specular-control
|
6 年前 |
|
Stephane Laroche
|
cbb9a885
|
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
|
6 年前 |
Tim Cooper
|
8406655d
|
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
|
6 年前 |
Nerites
|
9b69a952
|
Merge xrconfig branch into xrsettings
|
6 年前 |
|
Felipe Lira
|
164ce034
|
Fog is now computed outside the simple lighting function.
|
6 年前 |
|
GitHub
|
799ad6ba
|
Merge pull request #1637 from Unity-Technologies/lw/move-fog-outside-lighting
Fog is now computed outside the simple lighting function.
|
6 年前 |
|
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
6 年前 |
|
Nerites
|
86a99323
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
|
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
|
GitHub
|
7281fe31
|
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
|
6 年前 |
|
Stephane Laroche
|
73aab246
|
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
|
6 年前 |
|
Yao Xiaoling
|
15531c13
|
Fix review comments:
* Put all variables in cbuffer.
* Delete motion vector pass.
* Follow naming convention for basemap gen shader.
|
6 年前 |
Yao Xiao Ling
|
5b4c4f1c
|
Move PackHeightmap/UnpackHeightmap to Common.hlsl.
|
6 年前 |
|
GitHub
|
4bdfe711
|
Update LightweightPassLitTerrain.hlsl
Addressed a comment from code review
|
6 年前 |
|
GitHub
|
392abaf6
|
Merge pull request #1708 from Unity-Technologies/lw/terrain_optimization
Lw/terrain optimization
|
6 年前 |
|
sebastienlagarde
|
0267674b
|
Merge branch 'master' into HDRP/staging
|
6 年前 |
|
GitHub
|
ee4e73a4
|
Merge branch 'HDRP/staging' into RemoveSkyInLuxMeter
|
6 年前 |
|
sebastienlagarde
|
f75e94af
|
Merge branch 'HDRP/staging' into HDRP/fix/ObliqueLightLoop
|
6 年前 |
Sebastien Lagarde
|
72141169
|
Merge branch 'master' into lighting-arealigh-fixup
|
6 年前 |
|
Sebastien Lagarde
|
05036cac
|
Merge branch 'HDRP/staging' into HDLightExplorerExtension
|
6 年前 |
|
Frédéric Vauchelles
|
ce4065fd
|
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
|
6 年前 |
RSlysz
|
05f23629
|
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
|
6 年前 |
|
GitHub
|
01fdbb38
|
Merge branch 'master' into fix/coupling-hdlight-workflow
|
6 年前 |
|
Paul Melamed
|
9dbd8998
|
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
|
6 年前 |
|
Yao Xiao Ling
|
cfd45cf1
|
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
|
6 年前 |
|
GitHub
|
7cfc2ed0
|
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
|
6 年前 |
|
Yao Xiao Ling
|
f70f3a76
|
Add instanced per pixel normal for lw terrain shader.
|
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
|
237718e2
|
Merge pull request #1901 from Unity-Technologies/gpu-terrain
Enabled per-pixel terrain normal on LW terrain shader.
|
6 年前 |
|
GitHub
|
aae1a458
|
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
|
6 年前 |
