浏览代码
Merge branch 'master' into LW-Bugfix
Merge branch 'master' into LW-Bugfix
# Conflicts: # ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl/main
当前提交
47a2960a
共有 184 个文件被更改,包括 2060 次插入 和 392 次删除
-
6ScriptableRenderPipeline/Core/CoreRP/Editor/Debugging/DebugState.cs
-
36ScriptableRenderPipeline/Core/CoreRP/Editor/Debugging/DebugUIDrawer.Builtins.cs
-
1ScriptableRenderPipeline/Core/CoreRP/Editor/Debugging/DebugUIDrawer.cs
-
35ScriptableRenderPipeline/Core/CoreRP/Editor/Debugging/DebugWindow.cs
-
12ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Unlit/BaseUnlitUI.cs
-
14ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/FrameSettingsUI.cs
-
2ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedFrameSettings.cs
-
45ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
-
1ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
-
44ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/LayeredLit.shader
-
47ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/LayeredLitTessellation.shader
-
6ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
-
44ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.shader
-
47ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/LitTessellation.shader
-
4ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/FrameSettings.cs
-
13ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/DefaultHDMaterial.mat
-
2ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassForward.hlsl
-
2ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassGBuffer.hlsl
-
23ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyRenderingContext.cs
-
8ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
-
38ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Core.hlsl
-
33ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/InputSurface.hlsl
-
29ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
-
104ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Particles.hlsl
-
7ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
-
2ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightScreenSpaceShadows.shader
-
2ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandard.shader
-
18ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandardParticles.shader
-
50ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandardParticlesUnlit.shader
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Materials/Cornell Box.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Materials/Cornell Box_green.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Materials/Cornell Box_red.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/GroundLeaf/GroundLeaf.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/PerryHead/Head.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/ComplexMaterial/ComplexMaterial.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/FourShapes.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/FourShapes_POM.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/FourShapes_POM_DepthOffset.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/FourShapes_Tesselation.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/HDRP_Default_Material.mat
-
7Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/LIT_BLUE.MAT
-
7Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/LIT_CYAN.MAT
-
7Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/LIT_RED.MAT
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/Lit_Black.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/Lit_DarkGrey.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/Lit_Green.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/Lit_LightGrey.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/Lit_MidGrey.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/Lit_Purple.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/Lit_White.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Lit_Color/Lit_Yellow.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_00.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_01.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_02.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_03.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_04.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_05.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_06.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_07.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_08.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_09.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_Metal_Smooth_10.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_00.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_01.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_02.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_03.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_04.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_05.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_06.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_07.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_08.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_09.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_10.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/Transparent.mat
-
2Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity
-
2Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1102_Unlit_Distortion.unity
-
2Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1103_Unlit_Distortion_DepthTest.unity
-
353Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1201_Lit_Features.unity
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1201_Lit_Features/Lit_Detail.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1201_Lit_Features/Lit_Detail_Mask.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1201_Lit_Features/Lit_Detail_ParamsTest.mat
-
1Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1201_Lit_Features/Lit_NormalMap_ObjectSpace.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1201_Lit_Features/Lit_NormalMap_TangentSpace.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1201_Lit_Features/Lit_Texture.mat
-
79Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode.unity
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode/DoubleSideNormalTest.mat
-
353Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1203_Lit_Transparent.unity
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1203_Lit_Transparent/Lit_Transparent_Additive.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1203_Lit_Transparent/Lit_Transparent_Alpha.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1203_Lit_Transparent/Lit_Transparent_Multiplicative.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1203_Lit_Transparent/Lit_Transparent_PremultipliedAlpha.mat
-
2Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1204_Lit_Transparent_Fog.unity
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1204_Lit_Transparent_Fog/Lit_Transparent_Fog_Off.mat
-
13Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1204_Lit_Transparent_Fog/Lit_Transparent_Fog_On.mat
-
219Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
-
7Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane.mat
-
7Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
-
7Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
-
7Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Thickness.mat
353
Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1201_Lit_Features.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
353
Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1203_Lit_Transparent.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue