From aabdc8838301c279f804b1b666c1db40f50d55f5 Mon Sep 17 00:00:00 2001 From: Elizabeth LeGros Date: Thu, 2 Apr 2020 14:58:55 -0500 Subject: [PATCH 1/7] Adding preferences page --- com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md diff --git a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md new file mode 100644 index 00000000000..e69de29bb2d From b11a8f4a876abfb4c58a1543d4716f44e61eda45 Mon Sep 17 00:00:00 2001 From: elizabeth-legros <59933602+elizabeth-legros@users.noreply.github.com> Date: Thu, 2 Apr 2020 16:00:43 -0500 Subject: [PATCH 2/7] Update Shadergraph-Preferences.md --- .../Documentation~/Shadergraph-Preferences.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md index e69de29bb2d..0e5bdafc120 100644 --- a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md +++ b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md @@ -0,0 +1,8 @@ +# Shader Graph Preferences + +This window is where the Shader Graph project wide settings are listed. + +## Settings +| Setting | Description | +|:------- |:----------- | +|Shader Variant Limit| It is possible to add keywords to a graph to create shader variants and is a good practice when creating "uber shaders". The number of shader variants a shader should use is largely determined by the target platform, and every keyword added grows at minimum doubles the number of variants for a graph. Instead of allowing a user's hardware to dictate the max number of shader variants, this setting can be set and any graph that exceeds this limit will throw an error in the graph. | From 1d056859007c91608d077c1398ff65823a6e3a18 Mon Sep 17 00:00:00 2001 From: elizabeth-legros <59933602+elizabeth-legros@users.noreply.github.com> Date: Thu, 2 Apr 2020 16:10:50 -0500 Subject: [PATCH 3/7] Update Shadergraph-Preferences.md --- com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md index 0e5bdafc120..b8fef4c511d 100644 --- a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md +++ b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md @@ -5,4 +5,4 @@ This window is where the Shader Graph project wide settings are listed. ## Settings | Setting | Description | |:------- |:----------- | -|Shader Variant Limit| It is possible to add keywords to a graph to create shader variants and is a good practice when creating "uber shaders". The number of shader variants a shader should use is largely determined by the target platform, and every keyword added grows at minimum doubles the number of variants for a graph. Instead of allowing a user's hardware to dictate the max number of shader variants, this setting can be set and any graph that exceeds this limit will throw an error in the graph. | +|Shader Variant Limit| It is possible to add keywords to a graph to create shader variants and is a good practice when creating "uber shaders". The number of shader variants a shader should use is largely determined by the target platform, and every keyword added at minimum doubles the number of variants for a graph. Instead of allowing a user's hardware to dictate the max number of shader variants, this setting can be set and any graph that exceeds this limit will throw an error in the graph. | From 82775fdc8320cfc1d5b33086588ea91ffa789d86 Mon Sep 17 00:00:00 2001 From: elizabeth-legros <59933602+elizabeth-legros@users.noreply.github.com> Date: Thu, 2 Apr 2020 16:46:38 -0500 Subject: [PATCH 4/7] adding the error thrown to the page --- com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md index b8fef4c511d..4487604a721 100644 --- a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md +++ b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md @@ -5,4 +5,4 @@ This window is where the Shader Graph project wide settings are listed. ## Settings | Setting | Description | |:------- |:----------- | -|Shader Variant Limit| It is possible to add keywords to a graph to create shader variants and is a good practice when creating "uber shaders". The number of shader variants a shader should use is largely determined by the target platform, and every keyword added at minimum doubles the number of variants for a graph. Instead of allowing a user's hardware to dictate the max number of shader variants, this setting can be set and any graph that exceeds this limit will throw an error in the graph. | +|Shader Variant Limit| It is possible to add keywords to a graph to create shader variants and is a good practice when creating "uber shaders". The number of shader variants a shader should use is largely determined by the target platform, and every keyword added at minimum doubles the number of variants for a graph. Instead of allowing a user's hardware to dictate the max number of shader variants, this setting can be set and any graph that exceeds this limit will throw an error in the graph: Validation: Graph is generating too many variants. Either delete Keywords, reduce Keyword variants or increase the Shader Variant Limit in Preferences > Shader Graph.| From e17a135d160816a169ba5d02c182163409279e82 Mon Sep 17 00:00:00 2001 From: elizabeth-legros <59933602+elizabeth-legros@users.noreply.github.com> Date: Thu, 2 Apr 2020 16:47:39 -0500 Subject: [PATCH 5/7] Update Shadergraph-Preferences.md --- com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md index 4487604a721..dbf065ecec4 100644 --- a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md +++ b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md @@ -5,4 +5,4 @@ This window is where the Shader Graph project wide settings are listed. ## Settings | Setting | Description | |:------- |:----------- | -|Shader Variant Limit| It is possible to add keywords to a graph to create shader variants and is a good practice when creating "uber shaders". The number of shader variants a shader should use is largely determined by the target platform, and every keyword added at minimum doubles the number of variants for a graph. Instead of allowing a user's hardware to dictate the max number of shader variants, this setting can be set and any graph that exceeds this limit will throw an error in the graph: Validation: Graph is generating too many variants. Either delete Keywords, reduce Keyword variants or increase the Shader Variant Limit in Preferences > Shader Graph.| +|Shader Variant Limit| It is possible to add keywords to a graph to create shader variants and is a good practice when creating "uber shaders". The number of shader variants a shader should use is largely determined by the target platform, and every keyword added at minimum doubles the number of variants for a graph. Instead of allowing a user's hardware to dictate the max number of shader variants, this setting can be set and any graph that exceeds this limit will throw an error in the graph: "Validation: Graph is generating too many variants. Either delete Keywords, reduce Keyword variants or increase the Shader Variant Limit in Preferences > Shader Graph."| From 0dc3acc149b8827e7c0437534a4cac564a9c68ef Mon Sep 17 00:00:00 2001 From: Sharlene Tan <43795986+sharlenet@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:48:32 -0700 Subject: [PATCH 6/7] Updated and renamed Shader-Graph-Preferences.md --- .../Documentation~/Shader-Graph-Preferences.md | 9 +++++++++ .../Documentation~/Shadergraph-Preferences.md | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 com.unity.shadergraph/Documentation~/Shader-Graph-Preferences.md delete mode 100644 com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md diff --git a/com.unity.shadergraph/Documentation~/Shader-Graph-Preferences.md b/com.unity.shadergraph/Documentation~/Shader-Graph-Preferences.md new file mode 100644 index 00000000000..4e8fa08b53d --- /dev/null +++ b/com.unity.shadergraph/Documentation~/Shader-Graph-Preferences.md @@ -0,0 +1,9 @@ +# Shader Graph Preferences + +To access the Shader Graph Project-wide settings, click **Edit** > **Preferences**, and then select **Shader Graph**. + +## Settings + +| Name | Description | +|:------- |:----------- | +|Shader Variant Limit| Enter a value to set the maximum number of shader variants. If your graph exceeds this maximum value, Unity throws the following error: _Validation: Graph is generating too many variants. Either delete Keywords, reduce Keyword variants or increase the Shader Variant Limit in Preferences > Shader Graph._ For more information about shader variants, see [Making multiple shader program variants](https://docs.unity3d.com/Manual/SL-MultipleProgramVariants.html). | diff --git a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md b/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md deleted file mode 100644 index dbf065ecec4..00000000000 --- a/com.unity.shadergraph/Documentation~/Shadergraph-Preferences.md +++ /dev/null @@ -1,8 +0,0 @@ -# Shader Graph Preferences - -This window is where the Shader Graph project wide settings are listed. - -## Settings -| Setting | Description | -|:------- |:----------- | -|Shader Variant Limit| It is possible to add keywords to a graph to create shader variants and is a good practice when creating "uber shaders". The number of shader variants a shader should use is largely determined by the target platform, and every keyword added at minimum doubles the number of variants for a graph. Instead of allowing a user's hardware to dictate the max number of shader variants, this setting can be set and any graph that exceeds this limit will throw an error in the graph: "Validation: Graph is generating too many variants. Either delete Keywords, reduce Keyword variants or increase the Shader Variant Limit in Preferences > Shader Graph."| From 14de581b42963024d6827c9bbe6fe1507b202cb0 Mon Sep 17 00:00:00 2001 From: Sharlene Tan Date: Thu, 16 Apr 2020 14:54:37 -0700 Subject: [PATCH 7/7] Updated TableOfContents.md --- com.unity.shadergraph/Documentation~/TableOfContents.md | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.shadergraph/Documentation~/TableOfContents.md b/com.unity.shadergraph/Documentation~/TableOfContents.md index 19c3f682823..224005303b1 100644 --- a/com.unity.shadergraph/Documentation~/TableOfContents.md +++ b/com.unity.shadergraph/Documentation~/TableOfContents.md @@ -11,6 +11,7 @@ * [Color Modes](Color-Modes) * [Precision Modes](Precision-Modes) * [Custom Function Node](Custom-Function-Node) + * [Shader Graph Preferences](Shader-Graph-Preferences) * [Samples](ShaderGraph-Samples.md) * Inside Shader Graph * [Shader Graph Asset](Shader-Graph-Asset)