Skip to content

Enable Hybrid V2 DOTS instancing for previously unsupported shader graph passes #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebastienlagarde merged 1 commit into from
Apr 7, 2020
Merged

Enable Hybrid V2 DOTS instancing for previously unsupported shader graph passes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/HDEyeSubTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static class EyePasses
requiredFields = CoreRequiredFields.Meta,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.Meta,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
keywords = CoreKeywords.HDBase,
includes = EyeIncludes.Meta,
};
Expand All @@ -88,7 +88,7 @@ public static class EyePasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.BlendShadowCaster,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
keywords = CoreKeywords.HDBase,
includes = EyeIncludes.DepthOnly,
};
Expand All @@ -113,7 +113,7 @@ public static class EyePasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.SceneSelection,
pragmas = CorePragmas.InstancedRenderingLayerEditorSync,
pragmas = CorePragmas.DotsInstancedInV2OnlyEditorSync,
defines = CoreDefines.SceneSelection,
keywords = CoreKeywords.HDBase,
includes = EyeIncludes.DepthOnly,
Expand All @@ -140,7 +140,7 @@ public static class EyePasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.DepthOnly,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.DepthMotionVectors,
keywords = CoreKeywords.DepthMotionVectorsNoNormal,
includes = EyeIncludes.DepthOnly,
Expand All @@ -167,7 +167,7 @@ public static class EyePasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.MotionVectors,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.DepthMotionVectors,
keywords = CoreKeywords.DepthMotionVectorsNoNormal,
includes = EyeIncludes.MotionVectors,
Expand All @@ -194,7 +194,7 @@ public static class EyePasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.Forward,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.Forward,
keywords = CoreKeywords.Forward,
includes = EyeIncludes.ForwardOnly,
Expand Down
12 changes: 6 additions & 6 deletions ....render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/HDFabricSubTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static class FabricPasses
requiredFields = CoreRequiredFields.Meta,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.Meta,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
keywords = CoreKeywords.HDBase,
includes = FabricIncludes.Meta,
};
Expand All @@ -103,7 +103,7 @@ public static class FabricPasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.BlendShadowCaster,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
keywords = CoreKeywords.HDBase,
includes = FabricIncludes.DepthOnly,
};
Expand All @@ -128,7 +128,7 @@ public static class FabricPasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.ShadowCaster,
pragmas = CorePragmas.InstancedRenderingLayerEditorSync,
pragmas = CorePragmas.DotsInstancedInV2OnlyEditorSync,
defines = CoreDefines.SceneSelection,
keywords = CoreKeywords.HDBase,
includes = FabricIncludes.DepthOnly,
Expand All @@ -155,7 +155,7 @@ public static class FabricPasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.DepthOnly,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.DepthMotionVectors,
keywords = CoreKeywords.DepthMotionVectorsNoNormal,
includes = FabricIncludes.DepthOnly,
Expand All @@ -182,7 +182,7 @@ public static class FabricPasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.MotionVectors,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.DepthMotionVectors,
keywords = CoreKeywords.DepthMotionVectorsNoNormal,
includes = FabricIncludes.MotionVectors,
Expand All @@ -209,7 +209,7 @@ public static class FabricPasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.Forward,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.Forward,
keywords = CoreKeywords.Forward,
includes = FabricIncludes.ForwardOnly,
Expand Down
18 changes: 9 additions & 9 deletions ...nity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HDHairSubTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static class HairPasses
requiredFields = CoreRequiredFields.Meta,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.Meta,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
keywords = CoreKeywords.HDBase,
includes = HairIncludes.Meta,
};
Expand All @@ -106,7 +106,7 @@ public static class HairPasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.BlendShadowCaster,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
keywords = CoreKeywords.HDBase,
includes = HairIncludes.DepthOnly,
};
Expand All @@ -131,7 +131,7 @@ public static class HairPasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.SceneSelection,
pragmas = CorePragmas.InstancedRenderingLayerEditorSync,
pragmas = CorePragmas.DotsInstancedInV2OnlyEditorSync,
defines = CoreDefines.SceneSelection,
keywords = CoreKeywords.HDBase,
includes = HairIncludes.DepthOnly,
Expand All @@ -158,7 +158,7 @@ public static class HairPasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.DepthOnly,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.DepthMotionVectors,
keywords = CoreKeywords.DepthMotionVectorsNoNormal,
includes = HairIncludes.DepthOnly,
Expand All @@ -185,7 +185,7 @@ public static class HairPasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = HairRenderStates.MotionVectors,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.DepthMotionVectors,
keywords = CoreKeywords.DepthMotionVectorsNoNormal,
includes = HairIncludes.MotionVectors,
Expand All @@ -211,7 +211,7 @@ public static class HairPasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.TransparentDepthPrePostPass,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.TransparentDepthPrepass,
keywords = CoreKeywords.HDBase,
includes = HairIncludes.DepthOnly,
Expand All @@ -238,7 +238,7 @@ public static class HairPasses
requiredFields = CoreRequiredFields.LitMinimal,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.TransparentBackface,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.Forward,
keywords = CoreKeywords.Forward,
includes = HairIncludes.ForwardOnly,
Expand All @@ -265,7 +265,7 @@ public static class HairPasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.ForwardColorMask,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.Forward,
keywords = CoreKeywords.Forward,
includes = HairIncludes.ForwardOnly,
Expand All @@ -291,7 +291,7 @@ public static class HairPasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.TransparentDepthPrePostPass,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.ShaderGraphRaytracingHigh,
keywords = CoreKeywords.HDBase,
includes = HairIncludes.DepthOnly,
Expand Down
14 changes: 7 additions & 7 deletions com.unity.render-pipelines.high-definition/Editor/Material/PBR/ShaderGraph/PBRSubTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static class PBRPasses
requiredFields = CoreRequiredFields.LitMinimal,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = PBRRenderStates.GBuffer,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
keywords = PBRKeywords.GBuffer,
includes = PBRIncludes.GBuffer,
};
Expand All @@ -91,7 +91,7 @@ static class PBRPasses
requiredFields = CoreRequiredFields.Meta,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = CoreRenderStates.Meta,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
keywords = PBRKeywords.LodFadeCrossfade,
includes = PBRIncludes.Meta,
};
Expand All @@ -116,7 +116,7 @@ static class PBRPasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = PBRRenderStates.ShadowCaster,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
keywords = PBRKeywords.LodFadeCrossfade,
includes = PBRIncludes.DepthOnly,
};
Expand All @@ -141,7 +141,7 @@ static class PBRPasses
structs = CoreStructCollections.Default,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = PBRRenderStates.SceneSelection,
pragmas = CorePragmas.InstancedRenderingLayerEditorSync,
pragmas = CorePragmas.DotsInstancedInV2OnlyEditorSync,
defines = CoreDefines.SceneSelection,
keywords = PBRKeywords.LodFadeCrossfade,
includes = PBRIncludes.DepthOnly,
Expand All @@ -168,7 +168,7 @@ static class PBRPasses
requiredFields = CoreRequiredFields.LitFull,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = PBRRenderStates.DepthOnly,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.ShaderGraphRaytracingHigh,
keywords = PBRKeywords.DepthMotionVectors,
includes = PBRIncludes.DepthOnly,
Expand Down Expand Up @@ -197,7 +197,7 @@ static class PBRPasses

// Conditional State
renderStates = PBRRenderStates.MotionVectors,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.ShaderGraphRaytracingHigh,
keywords = PBRKeywords.DepthMotionVectors,
includes = PBRIncludes.MotionVectors,
Expand All @@ -224,7 +224,7 @@ static class PBRPasses
requiredFields = CoreRequiredFields.LitMinimal,
fieldDependencies = CoreFieldDependencies.Default,
renderStates = PBRRenderStates.Forward,
pragmas = CorePragmas.InstancedRenderingLayer,
pragmas = CorePragmas.DotsInstancedInV2Only,
defines = CoreDefines.Forward,
keywords = PBRKeywords.Forward,
includes = PBRIncludes.Forward,
Expand Down
2 changes: 2 additions & 0 deletions com.unity.render-pipelines.high-definition/Editor/ShaderGraph/HDTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ static class CorePragmas
{
{ Basic },
{ Pragma.MultiCompileInstancing },
{ Pragma.InstancingOptions(InstancingOptions.RenderingLayer) },
#if ENABLE_HYBRID_RENDERER_V2
{ Pragma.DOTSInstancing },
{ Pragma.InstancingOptions(InstancingOptions.NoLodFade) },
Expand All @@ -466,6 +467,7 @@ static class CorePragmas
{ Basic },
{ Pragma.MultiCompileInstancing },
{ Pragma.EditorSyncCompilation },
{ Pragma.InstancingOptions(InstancingOptions.RenderingLayer) },
#if ENABLE_HYBRID_RENDERER_V2
{ Pragma.DOTSInstancing },
{ Pragma.InstancingOptions(InstancingOptions.NoLodFade) },
Expand Down