浏览代码
Merge branch 'master' into LightweightPipeline
Merge branch 'master' into LightweightPipeline
# Conflicts: # Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader/RenderPassXR_Sandbox
Felipe Lira
7 年前
当前提交
7d62ca8f
共有 569 个文件被更改,包括 4273 次插入 和 2637 次删除
-
2Assets/GraphicsTests/Framework/Editor/TestFramework.cs
-
4Assets/GraphicsTests/RenderPipeline/HDRenderPipeline/HDRPAsset/HDRenderPipelineResourcesTest.asset
-
108Assets/ScriptableRenderPipeline/BasicRenderPipeline/BasicRenderPipeline.cs
-
4Assets/ScriptableRenderPipeline/BasicRenderPipeline/BasicRenderPipelineShader.shader
-
11Assets/ScriptableRenderPipeline/Core/Shadow/AdditionalShadowData.cs
-
67Assets/ScriptableRenderPipeline/Core/Shadow/Shadow.cs
-
4Assets/ScriptableRenderPipeline/Core/Shadow/ShadowBase.cs
-
12Assets/ScriptableRenderPipeline/Core/Shadow/ShadowBase.cs.hlsl
-
56Assets/ScriptableRenderPipeline/Core/Shadow/ShadowUtilities.cs
-
5Assets/ScriptableRenderPipeline/Core/Shadow/VectorArray.cs
-
71Assets/ScriptableRenderPipeline/Core/TextureCache.cs
-
42Assets/ScriptableRenderPipeline/Fptl/ClusteredUtils.h
-
11Assets/ScriptableRenderPipeline/Fptl/FptlLighting.cs
-
2Assets/ScriptableRenderPipeline/Fptl/LightDefinitions.cs.hlsl
-
10Assets/ScriptableRenderPipeline/Fptl/LightingConvexHullUtils.hlsl
-
16Assets/ScriptableRenderPipeline/Fptl/LightingTemplate.hlsl
-
24Assets/ScriptableRenderPipeline/Fptl/LightingUtils.hlsl
-
6Assets/ScriptableRenderPipeline/Fptl/ShadowDispatch.hlsl
-
26Assets/ScriptableRenderPipeline/Fptl/lightlistbuild-bigtile.compute
-
26Assets/ScriptableRenderPipeline/Fptl/lightlistbuild-clustered.compute
-
17Assets/ScriptableRenderPipeline/Fptl/lightlistbuild.compute
-
11Assets/ScriptableRenderPipeline/Fptl/scrbound.compute
-
10Assets/ScriptableRenderPipeline/HDRenderPipeline/AdditionalData/HDAdditionalLightData.cs
-
91Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs
-
19Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs.hlsl
-
39Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.hlsl
-
124Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugFullScreen.shader
-
2Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugViewMaterialGBuffer.shader
-
42Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugViewTiles.shader
-
2Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/LightingDebugPanel.cs
-
39Assets/ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
-
518Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
-
613Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
-
15Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/AmbientOcclusion/ScreenSpaceAmbientOcclusion.cs
-
1Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/AmbientOcclusion/ScreenSpaceAmbientOcclusion.shader
-
6Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/AmbientOcclusion/ScreenSpaceAmbientOcclusionSettings.cs
-
18Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/Deferred.shader
-
1Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/Forward.hlsl
-
64Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightDefinition.cs
-
180Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightDefinition.cs.hlsl
-
42Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/ClusteredUtils.hlsl
-
10Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/LightingConvexHullUtils.hlsl
-
6Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/ShadowDispatch.hlsl
-
713Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
-
22Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs.hlsl
-
36Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.hlsl
-
306Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePassLoop.hlsl
-
14Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/builddispatchindirect.compute
-
43Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/lightlistbuild-bigtile.compute
-
43Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/lightlistbuild-clustered.compute
-
37Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/lightlistbuild.compute
-
13Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/materialflags.compute
-
10Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/scrbound.compute
-
2Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Builtin/BuiltinData.hlsl
-
5Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit.meta
-
325Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/Editor/LayeredLitUI.cs
-
67Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
-
65Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader
-
16Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/BaseLitUI.cs
-
308Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
-
61Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.cs
-
67Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.cs.hlsl
-
843Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
-
12Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
-
215Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
-
24Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitDataInternal.hlsl
-
16Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
-
16Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitTessellation.hlsl
-
12Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitTessellation.shader
-
225Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Resources/SubsurfaceScattering.shader
-
122Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/SSSProfile/FoliageSSSProfile.asset
-
156Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/SSSProfile/SkinSSSProfile.asset
-
197Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/SubsurfaceScatteringProfile.cs
-
12Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
-
2Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/UnlitUI.cs
-
1Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Unlit.shader
-
42Assets/ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/CameraMotionVectors.shader
-
5Assets/ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/HDRenderPipelineResources.asset
-
6Assets/ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/RenderPipelineResources.cs
-
6Assets/ScriptableRenderPipeline/HDRenderPipeline/SceneSettings/Resources/DrawSssProfile.shader
-
19Assets/ScriptableRenderPipeline/HDRenderPipeline/SceneSettings/Resources/DrawTransmittanceGraph.shader
-
3Assets/ScriptableRenderPipeline/HDRenderPipeline/SceneSettings/SceneSettings.cs
-
11Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForward.hlsl
-
2Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassVelocity.hlsl
-
3Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl
-
4Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/HDRISky/HDRISkyRenderer.cs
-
191Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/ProceduralSky/Editor/ProceduralSkyEditor.cs
-
21Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
-
2Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/SkySettings.cs
-
15Assets/ScriptableRenderPipeline/HDRenderPipeline/Utilities.cs
-
96Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
-
7Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
-
2Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipelineCore.cginc
-
7Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightUnlit.shader
-
1Assets/ScriptableRenderPipeline/ShaderLibrary/API/D3D11.hlsl
-
1Assets/ScriptableRenderPipeline/ShaderLibrary/API/Metal.hlsl
-
1Assets/ScriptableRenderPipeline/ShaderLibrary/API/PSSL.hlsl
-
21Assets/ScriptableRenderPipeline/ShaderLibrary/AreaLighting.hlsl
-
33Assets/ScriptableRenderPipeline/ShaderLibrary/Common.hlsl
-
28Assets/ScriptableRenderPipeline/ShaderLibrary/CommonMaterial.hlsl
713
Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: c526d3e6d7f3ce1408308bb431089d2d |
|||
guid: 5cdc30333a95a30468e571c7db2230c0 |
|||
timeCreated: 1476653183 |
|||
timeCreated: 1501248892 |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
843
Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue