sebastienlagarde
|
530d5538
|
HDRenderPipeline: FactorLTCAreaCode
|
7 年前 |
GitHub
|
ff5089b7
|
Merge pull request #1219 from Unity-Technologies/FactorLTCAreaCode
HDRenderPipeline: FactorLTCAreaCode
|
7 年前 |
|
sebastienlagarde
|
a7a14891
|
Factor PreIntegratedFGD
|
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 年前 |
|
GitHub
|
517c5afd
|
Merge pull request #1220 from Unity-Technologies/Factor-PreIntegratedFGD
Factor PreIntegratedFGD
|
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 年前 |
|
Remy
|
9c81e0d8
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2102_GI_Emission.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2103_BakeMixed.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/9xxx_Other/9002_Deferr...
|
7 年前 |
Evgenii Golubev
|
9b95d6ea
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
7 年前 |
Felipe Lira
|
533beaae
|
Merge branch 'master' into LWRP
|
7 年前 |
|
sebastienlagarde
|
f5c6eec7
|
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
|
7 年前 |
Yao Xiaoling
|
cb671fbb
|
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
|
7 年前 |
|
Stephane Laroche
|
7f579046
|
Optimization for LTC area light: reusing already fetched FGD (clearcoat will now use FGD too instead of point-wise Fresnel term hack).
|
7 年前 |
|
sebastienlagarde
|
a73ccb75
|
Some cleanup (remove UNITY_MATERIAL_STACKLIT and LTC_USE_COMMON_FGD)
- Remove UNITY_MATERIAL_STACKLIT from shader library
- Remove now useless code of LTC_USE_COMMON_FGD
|
7 年前 |
|
sebastienlagarde
|
6a64d66c
|
Some extra cleanup
|
7 年前 |
|
GitHub
|
144723e3
|
Merge pull request #1476 from Unity-Technologies/StackLit2
Stack lit2
|
7 年前 |
Nerites
|
7bc5d1b4
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
7 年前 |
|
GitHub
|
32210ac9
|
Merge branch 'master' into switch-support
|
7 年前 |
|
GitHub
|
0610a60c
|
Merge branch 'master' into sg/error-for-incompatible-pipeline
|
7 年前 |
Sebastien Lagarde
|
5196e7ed
|
Merge branch 'master' into EmissiveMeshForAreaLight
|
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
|
1c4c0d09
|
Merge branch 'master' into sg/fix-dielectric-specular-control
|
7 年前 |
Tim Cooper
|
8406655d
|
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
|
7 年前 |
|
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
6 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
