From 870ac3121750b17bd67fc8f18af49ce57af64717 Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Mon, 15 Dec 2025 19:17:04 +0000 Subject: [PATCH 01/15] [Port] [6000.0] Fix UUM-125596 AcesTonemap() half precision bug --- .../com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl b/Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl index bf20910ed5f..47edf1fb58e 100644 --- a/Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl +++ b/Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl @@ -651,7 +651,7 @@ float3 AcesTonemap(float3 aces) // --- Red modifier --- // half hue = rgb_2_hue(half3(aces)); - half centeredHue = center_hue(hue, RRT_RED_HUE); + float centeredHue = center_hue(hue, RRT_RED_HUE); // UUM-125596 Must be float for subsequent calculations float hueWeight; { //hueWeight = cubic_basis_shaper(centeredHue, RRT_RED_WIDTH); From 180c6135057c449fe206ff4e0811227e8ce93830 Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Mon, 15 Dec 2025 19:17:05 +0000 Subject: [PATCH 02/15] [Port] [6000.0] DOCG-8164 Clarify Shader Graph Fraction node --- .../Documentation~/Fraction-Node.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Packages/com.unity.shadergraph/Documentation~/Fraction-Node.md b/Packages/com.unity.shadergraph/Documentation~/Fraction-Node.md index dcc84d4b83c..0fe0900ac45 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Fraction-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Fraction-Node.md @@ -1,8 +1,14 @@ -# Fraction Node +# Fraction node -## Description +The Fraction node returns the fractional part of an input, also known as the decimal part. The range is 0 to 1. For example, the fractional part of 3.75 is 0.75. -Returns the fractional (or decimal) part of input **In**; which is greater than or equal to 0 and less than 1. +The Fraction node calculates the result using the following formula: + +``` +fractional_part = input - floor(input) +``` + +As a result, the node returns a positive value if you input a negative number. For example, the fractional part of -3.75 is 0.25. ## Ports From 325aeea9f93d557a36edfd95513642912eccafcb Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Mon, 15 Dec 2025 19:17:05 +0000 Subject: [PATCH 03/15] [Port] [6000.0] Fix BRG,GRD and EG on 16KiB cbuffer limited low end mobiles --- .../ShaderLibrary/UnityDOTSInstancing.hlsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityDOTSInstancing.hlsl b/Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityDOTSInstancing.hlsl index b934dac7c25..50b0029512e 100644 --- a/Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityDOTSInstancing.hlsl +++ b/Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityDOTSInstancing.hlsl @@ -294,7 +294,7 @@ void SetupDOTSInstanceSelectMasks() {} #ifdef UNITY_DOTS_INSTANCING_UNIFORM_BUFFER CBUFFER_START(unity_DOTSInstancing_IndirectInstanceVisibility) - float4 unity_DOTSInstancing_IndirectInstanceVisibilityRaw[4096]; + float4 unity_DOTSInstancing_IndirectInstanceVisibilityRaw[1024]; CBUFFER_END #else ByteAddressBuffer unity_DOTSInstancing_IndirectInstanceVisibility; From 592193f265b653cf55c6e498bb34440c3b47def5 Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Mon, 15 Dec 2025 19:17:06 +0000 Subject: [PATCH 04/15] [Port] [6000.0] Graph Settings tab ref page update in Shader Graph docs --- .../Documentation~/Graph-Settings-Tab.md | 44 +++++++++++++----- .../images/GraphSettings_Menu.png | Bin 18408 -> 0 bytes 2 files changed, 32 insertions(+), 12 deletions(-) delete mode 100644 Packages/com.unity.shadergraph/Documentation~/images/GraphSettings_Menu.png diff --git a/Packages/com.unity.shadergraph/Documentation~/Graph-Settings-Tab.md b/Packages/com.unity.shadergraph/Documentation~/Graph-Settings-Tab.md index 949b6a8f959..86443d00ade 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Graph-Settings-Tab.md +++ b/Packages/com.unity.shadergraph/Documentation~/Graph-Settings-Tab.md @@ -1,20 +1,40 @@ -# Graph Settings Tab +# Graph Settings tab reference -## Description +Use the **Graph Settings** tab in the [Graph Inspector](Internal-Inspector.md) window to change settings that affect the current shader graph as a whole. -The **Graph Settings** tab on the [Graph Inspector](Internal-Inspector.md) makes it possible to change settings that affect the Shader Graph as a whole. +## General properties -![](images/GraphSettings_Menu.png) +| Property | Description | +| :--- | :--- | +| **Precision** | Select a default [Precision Mode](Precision-Modes.md) for the entire graph. You can override the precision mode at the node level in your graph. | +| **Preview** | Select your preferred preview mode for the nodes that support preview. The options are:
  • **Inherit**: The Unity Editor automatically selects the preview mode to use.
  • **Preview 2D**: Renders the output of the sub graph as a flat two-dimensional preview.
  • **Preview 3D**: Renders the output of the sub graph on a three-dimensional object such as a sphere.
This property is available only in [sub graphs](Sub-graph.md). | -### Graph Settings options +## Target Settings -| Menu Item | Description | -|:----------|:------------| -| **Precision** | Select **Single** or **Half** from the [Precision](Precision-Modes.md) dropdown menu as the graph's default Precision Mode for the entire graph. | -| **Preview Mode** | Select your preferred preview mode for a node that has a preview from the following options:
  • **Inherit**: The Unity Editor automatically selects the preview mode to use.
  • **Preview 2D**: Renders the output of the Sub Graph as a flat two-dimensional preview.
  • **Preview 3D**: Renders the output of the Sub Graph on a three-dimensional object such as a sphere.
This property is available only when you selected a [Sub Graph](Sub-graph.md). | -| **Active Targets** | A list that contains selected targets. You can add or remove **Active Targets** by selecting the **Add (+)** and **Remove (−)** buttons, respectively.
Shader Graph supports three targets:
  • **Built-in**: Shaders for Unity’s [Built-In Render Pipeline](xref:um-render-pipelines).
  • **Custom Render Texture**: Shaders for updating [Custom Render Textures](Custom-Render-Texture.md).
  • **Universal**: Shaders for the [Universal Render Pipeline](xref:um-shaders-in-universalrp-reference).
The available properties displayed depend on the targets you have added to the list. Refer to the [Shader Material Inspector window properties](xref:um-shaders-in-universalrp-reference) for the respective **Materials** you select for the **Built-in** and **Universal** targets.| +Add or remove graph targets to the current shader graph and set target properties according to the selected material type. + +### Active Targets + +A list that contains the [graph targets](Graph-Target.md) selected for the current shader graph. Select the **Add (+)** and **Remove (−)** buttons to add or remove **Active Targets**. + +Shader Graph supports the following target types: +* **Custom Render Texture**: Shaders for updating [Custom Render Textures](Custom-Render-Texture.md). +* **Built-in**: Shaders for Unity’s [Built-In Render Pipeline](xref:built-in-render-pipeline). +* **Universal**: Shaders for the [Universal Render Pipeline (URP)](xref:um-universal-render-pipeline), available only if your project uses URP. +* **HDRP**: Shaders for the [High Definition Render Pipeline (HDRP)](xref:high-definition-render-pipeline), available only if your project uses HDRP. + +### Target properties + +Each graph target added in the list of **Active Targets** has its own set of properties. + +| Property | Description | +| :--- | :--- | +| **Material** | Selects a material type for the target. The available options depend on the current target type. | +| Other properties (contextual) | A set of material and shader related properties that correspond to the current target type and the **Material** you select for the target.
  • For Universal Render Pipeline (URP) target properties, refer to [Shader graph material Inspector window reference for URP](xref:um-shaders-in-universalrp-reference).
  • For High Definition Render Pipeline (HDRP) target properties, refer to HDRP's [Shader Graph materials reference](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest/index.html?subfolder=/manual/shader-graph-materials-reference.html).
| +| **Custom Editor GUI** | Renders a custom editor GUI in the Inspector window of the material. Enter the name of the GUI class in the field. For more information, refer to [Control material properties in the Inspector window](xref:um-writing-shader-display-types) and [Custom Editor block in ShaderLab reference](xref:um-sl-custom-editor). | +| **Support VFX Graph** | Enables this shader graph to support the [Visual Effect Graph](https://docs.unity3d.com/Packages/com.unity.visualeffectgraph@latest) to render particles.
**Note**: This option is only available for certain material types. | ## Additional resources + - [Precision Modes](Precision-Modes.md) -- [Example Custom Render Texture with Shader Graph](Custom-Render-Texture-Example.md) -- [Custom Editor block in ShaderLab reference](xref:um-sl-custom-editor) \ No newline at end of file +- [Graph targets](Graph-Target.md) diff --git a/Packages/com.unity.shadergraph/Documentation~/images/GraphSettings_Menu.png b/Packages/com.unity.shadergraph/Documentation~/images/GraphSettings_Menu.png deleted file mode 100644 index 33717fc6f610277e93bb0b3ea04074ca9df1b56e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18408 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 From 45092c310274aa1eb7d481eb1da701e84a1332ce Mon Sep 17 00:00:00 2001 From: Fred Moreau Date: Tue, 16 Dec 2025 15:32:49 +0000 Subject: [PATCH 05/15] [Port] [6000.0] Fixing Shader Graph Nodes Documentations Links --- .../Material/ShaderGraph/Nodes/CustomPassNodes.cs | 2 -- .../Material/ShaderGraph/Nodes/EmissionNode.cs | 2 +- .../Material/ShaderGraph/Nodes/ExposureNode.cs | 2 -- .../ShaderGraph/Nodes/FresnelEquationNode.cs | 2 -- .../Nodes/SurfaceGradientResolveNormal.cs | 2 -- .../ShaderGraph/Nodes/UniversalSampleBufferNode.cs | 2 -- ...om-Color-Node.md => Custom-Color-Buffer-Node.md} | 2 +- ...e-Self.md => Custom-Render-Texture-Self-Node.md} | 0 ...e-Size.md => Custom-Render-Texture-Size-Node.md} | 0 .../Documentation~/Custom-Render-Texture.md.meta | 3 --- .../Documentation~/Custom-Texture-Self.md.meta | 3 --- .../Documentation~/Custom-Texture-Size.md.meta | 3 --- .../Documentation~/Custom-Texture-Slice.md.meta | 3 --- ...{Sub-Graph-Dropdown-Node.md => Dropdown-Node.md} | 4 ++-- .../Documentation~/Material-Quality-Keyword-Node.md | 13 +++++++++++++ .../Documentation~/Property-Node.md | 3 +++ .../Raytracing-Quality-Keyword-Node.md | 11 +++++++++++ .../Documentation~/Redirect-Node.md | 8 ++++++++ ...re-Slice.md => Slice-Index-Cubemap-Face-Node.md} | 2 +- .../Documentation~/TableOfContents.md | 13 +++++++++---- .../Editor/Data/Nodes/Input/PropertyNode.cs | 2 +- .../Editor/Data/Nodes/Utility/CustomFunctionNode.cs | 2 ++ .../Editor/Data/Nodes/Utility/DropdownNode.cs | 2 ++ .../Editor/Data/Nodes/Utility/KeywordNode.cs | 7 +++++++ .../Editor/Data/Nodes/Utility/RedirectNodeData.cs | 2 ++ .../CustomRenderTexture/CustomTextureSlice.cs | 2 ++ 26 files changed, 65 insertions(+), 32 deletions(-) rename Packages/com.unity.shadergraph/Documentation~/{HD-Custom-Color-Node.md => Custom-Color-Buffer-Node.md} (96%) rename Packages/com.unity.shadergraph/Documentation~/{Custom-Texture-Self.md => Custom-Render-Texture-Self-Node.md} (100%) rename Packages/com.unity.shadergraph/Documentation~/{Custom-Texture-Size.md => Custom-Render-Texture-Size-Node.md} (100%) delete mode 100644 Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture.md.meta delete mode 100644 Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Self.md.meta delete mode 100644 Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Size.md.meta delete mode 100644 Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Slice.md.meta rename Packages/com.unity.shadergraph/Documentation~/{Sub-Graph-Dropdown-Node.md => Dropdown-Node.md} (84%) create mode 100644 Packages/com.unity.shadergraph/Documentation~/Material-Quality-Keyword-Node.md create mode 100644 Packages/com.unity.shadergraph/Documentation~/Property-Node.md create mode 100644 Packages/com.unity.shadergraph/Documentation~/Raytracing-Quality-Keyword-Node.md create mode 100644 Packages/com.unity.shadergraph/Documentation~/Redirect-Node.md rename Packages/com.unity.shadergraph/Documentation~/{Custom-Texture-Slice.md => Slice-Index-Cubemap-Face-Node.md} (97%) diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/CustomPassNodes.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/CustomPassNodes.cs index 5edfcd5e1c8..424a027aa13 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/CustomPassNodes.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/CustomPassNodes.cs @@ -19,8 +19,6 @@ public CustomColorBufferNode() UpdateNodeAfterDeserialization(); } - public override string documentationURL => NodeUtils.GetDocumentationString("HD-Custom-Color"); - const int kUvInputSlotId = 0; const string kUvInputSlotName = "UV"; diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/EmissionNode.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/EmissionNode.cs index c212be49ebf..3b43a6123c4 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/EmissionNode.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/EmissionNode.cs @@ -21,7 +21,7 @@ public EmissionNode() UpdateNodeAfterDeserialization(); } - public override string documentationURL => Documentation.GetPageLink("SGNode-Emission"); + public override string documentationURL => NodeUtils.GetDocumentationString("Emission"); [SerializeField] EmissiveIntensityUnit _intensityUnit; diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/ExposureNode.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/ExposureNode.cs index 8febdec5409..e3ee515121e 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/ExposureNode.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/ExposureNode.cs @@ -36,8 +36,6 @@ public ExposureNode() UpdateNodeAfterDeserialization(); } - public override string documentationURL => Documentation.GetPageLink("SGNode-Exposure"); - [SerializeField] ExposureType m_ExposureType; [EnumControl("Type")] diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/FresnelEquationNode.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/FresnelEquationNode.cs index 8ff0d46fd42..9adb39a1949 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/FresnelEquationNode.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/FresnelEquationNode.cs @@ -33,8 +33,6 @@ class HDFresnelEquationNode : AbstractMaterialNode const string kFresnelOutputSlotName = "Fresnel"; - public override string documentationURL => Documentation.GetPageLink("Fresnel-Equation-Node"); - private enum FresnelSlots { kDotVectorsInputSlotId, diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/SurfaceGradientResolveNormal.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/SurfaceGradientResolveNormal.cs index 86a7b20a525..ad49a5ce72b 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/SurfaceGradientResolveNormal.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/SurfaceGradientResolveNormal.cs @@ -18,8 +18,6 @@ public SurfaceGradientResolveNormal() UpdateNodeAfterDeserialization(); } - public override string documentationURL => Documentation.GetPageLink("SurfaceGradientResolveNormal"); - const int kNormalInputSlotId = 0; const string kNormalInputSlotName = "Normal"; diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Nodes/UniversalSampleBufferNode.cs b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Nodes/UniversalSampleBufferNode.cs index 913e3011768..1cc29013da3 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Nodes/UniversalSampleBufferNode.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Nodes/UniversalSampleBufferNode.cs @@ -47,8 +47,6 @@ public BufferType bufferType } } - public override string documentationURL => Documentation.GetPageLink(Documentation.packageName, "SGNode-Universal-Sample-Buffer"); - public UniversalSampleBufferNode() { name = "URP Sample Buffer"; diff --git a/Packages/com.unity.shadergraph/Documentation~/HD-Custom-Color-Node.md b/Packages/com.unity.shadergraph/Documentation~/Custom-Color-Buffer-Node.md similarity index 96% rename from Packages/com.unity.shadergraph/Documentation~/HD-Custom-Color-Node.md rename to Packages/com.unity.shadergraph/Documentation~/Custom-Color-Buffer-Node.md index a50424309f0..c9a51f67c79 100644 --- a/Packages/com.unity.shadergraph/Documentation~/HD-Custom-Color-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Custom-Color-Buffer-Node.md @@ -1,4 +1,4 @@ -# Custom Color Node (HDRP) +# Custom Color Buffer Node (HDRP) The Custom Color Node accesses the custom pass color buffer allocated by HDRP. diff --git a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Self.md b/Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture-Self-Node.md similarity index 100% rename from Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Self.md rename to Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture-Self-Node.md diff --git a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Size.md b/Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture-Size-Node.md similarity index 100% rename from Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Size.md rename to Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture-Size-Node.md diff --git a/Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture.md.meta b/Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture.md.meta deleted file mode 100644 index b48d1b25daa..00000000000 --- a/Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture.md.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d9f940345f7b44c9a3fb7de04f59264c -timeCreated: 1721813605 \ No newline at end of file diff --git a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Self.md.meta b/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Self.md.meta deleted file mode 100644 index 80b73f7e2ca..00000000000 --- a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Self.md.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: dc70aae0237140c39655012772dfaec0 -timeCreated: 1721813623 \ No newline at end of file diff --git a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Size.md.meta b/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Size.md.meta deleted file mode 100644 index 4b3e2bdf88f..00000000000 --- a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Size.md.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: c08245aa849d4003859deb1cbe0e9dd3 -timeCreated: 1721813649 \ No newline at end of file diff --git a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Slice.md.meta b/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Slice.md.meta deleted file mode 100644 index 0f3cdceab35..00000000000 --- a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Slice.md.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 959569f6b11b4449b793d4930158b695 -timeCreated: 1721813672 \ No newline at end of file diff --git a/Packages/com.unity.shadergraph/Documentation~/Sub-Graph-Dropdown-Node.md b/Packages/com.unity.shadergraph/Documentation~/Dropdown-Node.md similarity index 84% rename from Packages/com.unity.shadergraph/Documentation~/Sub-Graph-Dropdown-Node.md rename to Packages/com.unity.shadergraph/Documentation~/Dropdown-Node.md index d98ffd4be4e..338871e09e2 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Sub-Graph-Dropdown-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Dropdown-Node.md @@ -1,6 +1,6 @@ -# Sub Graph Dropdown node +# Dropdown node -The Sub Graph Dropdown node is a node representation of a Dropdown property. It allows you to create a custom dropdown menu on a Sub Graph node in its parent Shader Graph. You can specify the number of options that appear in the dropdown menu, and their names. +The Dropdown node is a node representation of a Dropdown property. It allows you to create a custom dropdown menu on a Subgraph node in its parent Shader Graph. You can specify the number of options that appear in the dropdown menu, and their names. After you create a Dropdown property and add a Dropdown node to a Subgraph, the Subgraph node in any parent Shader Graph displays with a dropdown control. diff --git a/Packages/com.unity.shadergraph/Documentation~/Material-Quality-Keyword-Node.md b/Packages/com.unity.shadergraph/Documentation~/Material-Quality-Keyword-Node.md new file mode 100644 index 00000000000..87627bd4e61 --- /dev/null +++ b/Packages/com.unity.shadergraph/Documentation~/Material-Quality-Keyword-Node.md @@ -0,0 +1,13 @@ +# Material Quality Keyword node + +The Material Quality Keyword node adds and uses global keywords MATERIAL_QUALITY_HIGH, MATERIAL_QUALITY_MEDIUM and MATERIAL_QUALITY_LOW and enables different behaviors for each one of the available quality types. + +**Note**: +* Adding this keyword increases the amount of shader variants. +* These quality keywords are only available in URP and HDRP, they are not available at the Built-in Render Pipeline. + +To manually set the quality level from a C# script, use the `UnityEngine.Rendering.MaterialQualityUtilities.SetGlobalShaderKeywords(...)` function. + +## Additional resources: + +* [Keywords](Keywords.md) diff --git a/Packages/com.unity.shadergraph/Documentation~/Property-Node.md b/Packages/com.unity.shadergraph/Documentation~/Property-Node.md new file mode 100644 index 00000000000..b1664651226 --- /dev/null +++ b/Packages/com.unity.shadergraph/Documentation~/Property-Node.md @@ -0,0 +1,3 @@ +# Property node + +Returns the value of the associated [Blackboard](Blackboard.md) Property. diff --git a/Packages/com.unity.shadergraph/Documentation~/Raytracing-Quality-Keyword-Node.md b/Packages/com.unity.shadergraph/Documentation~/Raytracing-Quality-Keyword-Node.md new file mode 100644 index 00000000000..a4862b487cc --- /dev/null +++ b/Packages/com.unity.shadergraph/Documentation~/Raytracing-Quality-Keyword-Node.md @@ -0,0 +1,11 @@ +# Raytracing Quality Keyword node + +**Note**: +* Adding this keyword increases the amount of shader variants. +* These quality keywords are only available in HDRP, they are not available with the Built-in and Universal Render Pipelines. + +Refer to `https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@17.4/manual/SGNode-Raytracing-Quality.html` for more information. + +## Additional resources: + +* [Keywords](Keywords.md) diff --git a/Packages/com.unity.shadergraph/Documentation~/Redirect-Node.md b/Packages/com.unity.shadergraph/Documentation~/Redirect-Node.md new file mode 100644 index 00000000000..c3c68f89e81 --- /dev/null +++ b/Packages/com.unity.shadergraph/Documentation~/Redirect-Node.md @@ -0,0 +1,8 @@ +# Redirect node + +Use redirect nodes to improve the graph's organization. They have no effect on the generated shader code. + +Redirect nodes don't appear in the node search. To add a redirect node, do one of the following: +- Double click on a wire. +- Right click on a wire and select **Add Redirect Node**. +- Select a wire and press `Ctrl/Cmd + R` on the keyboard. diff --git a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Slice.md b/Packages/com.unity.shadergraph/Documentation~/Slice-Index-Cubemap-Face-Node.md similarity index 97% rename from Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Slice.md rename to Packages/com.unity.shadergraph/Documentation~/Slice-Index-Cubemap-Face-Node.md index efb39dc3f2f..24626b92cb1 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Custom-Texture-Slice.md +++ b/Packages/com.unity.shadergraph/Documentation~/Slice-Index-Cubemap-Face-Node.md @@ -1,4 +1,4 @@ -# Custom Render Texture Slice Node +# Slice Index / Cubemap Face Node ## Description diff --git a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md index f00d3cb3c42..fa1feba3608 100644 --- a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md +++ b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md @@ -83,10 +83,10 @@ * [Split](Split-Node.md) * [Swizzle](Swizzle-Node.md) * [Custom Render Texture](Custom-Render-Texture-Nodes.md) - * [Self](Custom-Texture-Self.md) - * [Size](Custom-Texture-Size.md) - * [Slice](Custom-Texture-Slice.md) - * [Dropdowns](Sub-Graph-Dropdown-Node.md) + * [Self](Custom-Render-Texture-Self-Node.md) + * [Size](Custom-Render-Texture-Size-Node.md) + * [Slice](Slice-Index-Cubemap-Face-Node.md) + * [Dropdown](Dropdown-Node.md) * [Input](Input-Nodes.md) * Basic * [Boolean](Boolean-Node.md) @@ -166,6 +166,9 @@ * [Texture 2D Asset](Texture-2D-Asset-Node.md) * [Texture 3D Asset](Texture-3D-Asset-Node.md) * [Texture Size](Texture-Size-Node.md) + * [Keyword](Keyword-Node.md) + * [Material Quality](Material-Quality-Keyword-Node.md) + * [Raytracing Quality](Raytracing-Quality-Keyword-Node.md) * [Math](Math-Nodes.md) * Advanced * [Absolute](Absolute-Node.md) @@ -258,6 +261,8 @@ * [Rectangle](Rectangle-Node.md) * [Rounded Polygon](Rounded-Polygon-Node.md) * [Rounded Rectangle](Rounded-Rectangle-Node.md) + * [Property](Property-Node.md) + * [Redirect](Redirect-Node.md) * [SpeedTree](SpeedTree8-SubGraphAssets.md) * [Sub Graphs](Sub-graph-Node.md) * [UVCombine](UVCombine-Node.md) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs index b1f0703cad7..a8376469ca0 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs @@ -20,7 +20,7 @@ public PropertyNode() } // Property-Types - public override string documentationURL => UnityEngine.Rendering.ShaderGraph.Documentation.GetPageLink("Property-Types"); + public override string documentationURL => UnityEngine.Rendering.ShaderGraph.Documentation.GetPageLink("Property-Node"); public override void UpdateNodeAfterDeserialization() { diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs index 732c0a4b19e..6b000443f58 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs @@ -21,6 +21,8 @@ class CustomFunctionNode : AbstractMaterialNode, IGeneratesBodyCode, IGeneratesF public override IEnumerable allowedNodeVersions => new int[] { 1 }; + public override string documentationURL => NodeUtils.GetDocumentationString("Custom Function"); + [Serializable] public class MinimalCustomFunctionNode : IHasDependencies { diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/DropdownNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/DropdownNode.cs index 71c6a45dbef..4891b815f7c 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/DropdownNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/DropdownNode.cs @@ -14,6 +14,8 @@ class DropdownNode : AbstractMaterialNode, IOnAssetEnabled, IGeneratesBodyCode, { internal const int k_MinEnumEntries = 2; + public override string documentationURL => NodeUtils.GetDocumentationString("Dropdown"); + public DropdownNode() { UpdateNodeAfterDeserialization(); diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs index fe70eabc218..b636d928514 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs @@ -16,6 +16,13 @@ class KeywordNode : AbstractMaterialNode, IOnAssetEnabled, IGeneratesBodyCode, I internal const int k_MinEnumEntries = 2; internal const int k_MaxEnumEntries = 8; + public override string documentationURL => NodeUtils.GetDocumentationString(keyword.overrideReferenceName switch + { + "MATERIAL_QUALITY" => "Material Quality Keyword", + "RAYTRACING_SHADER_GRAPH" => "Raytracing Quality Keyword", + _ => "Keyword", + }); + public KeywordNode() { UpdateNodeAfterDeserialization(); diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs index 54827e025e1..2a65f64c80c 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs @@ -12,6 +12,8 @@ class RedirectNodeData : AbstractMaterialNode public const int kInputSlotID = 0; public const int kOutputSlotID = 1; + public override string documentationURL => NodeUtils.GetDocumentationString("Redirect"); + public RedirectNodeData() { name = "Redirect Node"; diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/CustomRenderTexture/CustomTextureSlice.cs b/Packages/com.unity.shadergraph/Editor/Generation/Targets/CustomRenderTexture/CustomTextureSlice.cs index ebc6c5cf1e0..89036ca4f70 100644 --- a/Packages/com.unity.shadergraph/Editor/Generation/Targets/CustomRenderTexture/CustomTextureSlice.cs +++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/CustomRenderTexture/CustomTextureSlice.cs @@ -21,6 +21,8 @@ public CustomTextureSlice() UpdateNodeAfterDeserialization(); } + public override string documentationURL => NodeUtils.GetDocumentationString("Slice Index Cubemap Face"); + protected int[] validSlots => new[] { OutputSlotCubeFaceId, OutputSlot3DSliceId }; public sealed override void UpdateNodeAfterDeserialization() From fc24951fc8a32d7ed378d64dc26aa90a47f2eedc Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Tue, 16 Dec 2025 15:32:49 +0000 Subject: [PATCH 06/15] [Port] [6000.0] Added a new method to change Global Settings in Player --- .../Runtime/RenderPipeline/HDRenderPipelineAsset.cs | 3 +++ .../Runtime/Data/UniversalRenderPipelineAsset.cs | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index 023d66b8d6a..b0b34637ed3 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -26,6 +26,9 @@ public partial class HDRenderPipelineAsset : RenderPipelineAsset public override string renderPipelineShaderTag => HDRenderPipeline.k_ShaderTagName; + /// + protected override bool requiresCompatibleRenderPipelineGlobalSettings => true; + [System.NonSerialized] internal bool isInOnValidateCall = false; diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs index 902af562a6e..ff53072d77b 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs @@ -1620,6 +1620,9 @@ public int numIterationsEnclosingSphere /// public override string renderPipelineShaderTag => UniversalRenderPipeline.k_ShaderTagName; + /// + protected override bool requiresCompatibleRenderPipelineGlobalSettings => true; + /// Names used for display of rendering layer masks. [Obsolete("This property is obsolete. Use RenderingLayerMask API and Tags & Layers project settings instead. #from(23.3)", false)] public override string[] renderingLayerMaskNames => RenderingLayerMask.GetDefinedRenderingLayerNames(); @@ -1968,5 +1971,6 @@ public bool isStpUsed { get { return m_UpscalingFilter == UpscalingFilterSelection.STP; } } + } } From fadd67ac0d52fc6f51ca6478158f532a7073e83c Mon Sep 17 00:00:00 2001 From: Yohann Vaast Date: Tue, 16 Dec 2025 15:32:50 +0000 Subject: [PATCH 07/15] [Port] [6000.0] Manual backport: fix the FD issue by avoiding pooling of textures --- .../Runtime/RenderGraph/RenderGraph.cs | 10 ++++++++++ .../Runtime/RenderGraph/RenderGraphResourceRegistry.cs | 2 +- .../Runtime/RenderGraph/RenderGraphResources.cs | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index bd41fe40c8f..5cc3d10cd79 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -61,6 +61,7 @@ public class InternalRenderGraphContext internal RenderGraphDefaultResources defaultResources; internal RenderGraphPass executingPass; internal bool contextlessTesting; + internal bool forceResourceCreation; } // This whole thing is a bit of a mess InternalRenderGraphContext is public (but all members are internal) @@ -1186,6 +1187,15 @@ public void BeginRecording(in RenderGraphParameters parameters) m_RenderGraphContext.renderGraphPool = m_RenderGraphPool; m_RenderGraphContext.defaultResources = m_DefaultResources; + // With the actual implementation of the Frame Debugger, we cannot re-use resources during the same frame + // or it breaks the rendering of the pass preview, since the FD copies the texture after the execution of the RG. + m_RenderGraphContext.forceResourceCreation = +#if UNITY_EDITOR || DEVELOPMENT_BUILD + FrameDebugger.enabled; +#else + false; +#endif + if (m_DebugParameters.immediateMode) { UpdateCurrentCompiledGraph(graphHash: -1, forceNoCaching: true); diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index 9a4f6fda084..923fa80be85 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -1034,7 +1034,7 @@ internal bool CreatePooledResource(InternalRenderGraphContext rgContext, int typ var resource = m_RenderGraphResources[type].resourceArray[index]; if (!resource.imported) { - resource.CreatePooledGraphicsResource(); + resource.CreatePooledGraphicsResource(rgContext.forceResourceCreation); if (m_RenderGraphDebug.enableLogging) resource.LogCreation(m_FrameInformationLogger); diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs index df4c4ccc562..61b72e84fa5 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs @@ -188,7 +188,7 @@ public virtual bool NeedsFallBack() return requestFallBack && writeCount == 0; } - public virtual void CreatePooledGraphicsResource() { } + public virtual void CreatePooledGraphicsResource(bool forceResourceCreation) { } public virtual void CreateGraphicsResource() { } public virtual void UpdateGraphicsResource() { } public virtual void ReleasePooledGraphicsResource(int frameIndex) { } @@ -236,7 +236,7 @@ public override void ReleaseGraphicsResource() graphicsResource = null; } - public override void CreatePooledGraphicsResource() + public override void CreatePooledGraphicsResource(bool forceResourceCreation) { Debug.Assert(m_Pool != null, "RenderGraphResource: CreatePooledGraphicsResource should only be called for regular pooled resources"); @@ -247,7 +247,7 @@ public override void CreatePooledGraphicsResource() // If the pool doesn't have any available resource that we can use, we will create one // In any case, we will update the graphicsResource name based on the RenderGraph resource name - if (!m_Pool.TryGetResource(hashCode, out graphicsResource)) + if (forceResourceCreation || !m_Pool.TryGetResource(hashCode, out graphicsResource)) { CreateGraphicsResource(); } From ef7f44f76601450d0005568d73f08ea7fa542ca4 Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Tue, 16 Dec 2025 15:32:51 +0000 Subject: [PATCH 08/15] [Port] [6000.0] Add missing DEBUG_DISPLAY check to MixFogColor --- .../ShaderLibrary/ShaderVariablesFunctions.hlsl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl b/Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl index ad0631b6407..cd9c4988c41 100644 --- a/Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl +++ b/Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl @@ -392,9 +392,12 @@ float ComputeFogIntensity(float fogFactor) half3 MixFogColor(half3 fragColor, half3 fogColor, half fogFactor) { #if defined(FOG_LINEAR) || defined(FOG_EXP) || defined(FOG_EXP2) + if (IsFogEnabled()) + { half fogIntensity = ComputeFogIntensity(fogFactor); // Workaround for UUM-61728: using a manual lerp to avoid rendering artifacts on some GPUs when Vulkan is used fragColor = fragColor * fogIntensity + fogColor * (half(1.0) - fogIntensity); + } #endif return fragColor; } From 3a01d2198db632f6b2980d22372f4489e9a30658 Mon Sep 17 00:00:00 2001 From: Fred Moreau Date: Thu, 18 Dec 2025 18:59:06 +0000 Subject: [PATCH 09/15] [Port] [6000.0] [Shader Graph] Fix for UUM-114439 --- .../Scripts/Runtime/CustomToggle.cs | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs index 06ce1e14708..c952b694feb 100644 --- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs +++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs @@ -61,6 +61,7 @@ public Graphic Graphic protected override void Awake() { base.Awake(); + onValueChanged.AddListener((x) => UpdateMaterial()); } #if UNITY_EDITOR @@ -85,31 +86,13 @@ protected override void OnValidate() if (!PrefabUtility.IsPartOfPrefabAsset(this) && !Application.isPlaying) CanvasUpdateRegistry.RegisterCanvasElementForLayoutRebuild(this); - UpdateMaterial(true); + UpdateMaterial(); } #endif - public void UpdateMaterial(bool findGroupToggles = false) + public void UpdateMaterial() { - if (group != null) - { - if (findGroupToggles) // only used in Edit mode when ToggleGroup isn't initialized already - { - foreach (var t in FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None)) - if (t.group == group) - t.Graphic.SetMaterialDirty(); - } - else - { - foreach(var t in group.ActiveToggles()) - if (t is CustomToggle customToggle) - customToggle.Graphic.SetMaterialDirty(); - } - } - else - { - Graphic.SetMaterialDirty(); - } + Graphic.SetMaterialDirty(); } protected override void DoStateTransition(SelectionState state, bool instant) @@ -121,8 +104,7 @@ protected override void DoStateTransition(SelectionState state, bool instant) public virtual Material GetModifiedMaterial(Material baseMaterial) { - _material ??= new Material(baseMaterial); - + _material ??= new(baseMaterial); _material.CopyPropertiesFromMaterial(baseMaterial); if (_material.HasFloat(StatePropertyId)) @@ -130,7 +112,7 @@ public virtual Material GetModifiedMaterial(Material baseMaterial) if (_material.HasFloat(IsOnPropertyId)) _material.SetFloat(IsOnPropertyId, isOn ? 1 : 0); - + return _material; } From 6dbe4352b9ca027dae5196095b3098425b9434df Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Thu, 18 Dec 2025 18:59:06 +0000 Subject: [PATCH 10/15] [Port] [6000.0] Fixed ClearDispatchIndirect being passed incorrect group size. --- .../Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index c905caf5f24..aa26004f005 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -369,7 +369,7 @@ static void BuildDispatchIndirectArguments(BuildGPULightListPassData data, bool // clear dispatch indirect buffer cmd.SetComputeBufferParam(data.clearDispatchIndirectShader, s_ClearDispatchIndirectKernel, HDShaderIDs.g_DispatchIndirectBuffer, data.output.dispatchIndirectBuffer); - cmd.DispatchCompute(data.clearDispatchIndirectShader, s_ClearDispatchIndirectKernel, 1, 1, 1); + cmd.DispatchCompute(data.clearDispatchIndirectShader, s_ClearDispatchIndirectKernel, HDUtils.DivRoundUp(LightDefinitions.s_NumFeatureVariants, k_ThreadGroupOptimalSize), 1, data.viewCount); // add tiles to indirect buffer cmd.SetComputeBufferParam(data.buildDispatchIndirectShader, s_BuildIndirectKernel, HDShaderIDs.g_DispatchIndirectBuffer, data.output.dispatchIndirectBuffer); From 19499902c663f357ff410a51deb42929384d35fd Mon Sep 17 00:00:00 2001 From: Mark Green Date: Fri, 19 Dec 2025 22:54:35 +0000 Subject: [PATCH 11/15] [Port] [6000.0] Shader Graph documentation bugfixes Dec 2025 --- .../Documentation~/Custom-Render-Texture-Nodes.md | 6 +++--- .../com.unity.shadergraph/Documentation~/TableOfContents.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture-Nodes.md b/Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture-Nodes.md index 2ae0b3724bd..34a482954f0 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture-Nodes.md +++ b/Packages/com.unity.shadergraph/Documentation~/Custom-Render-Texture-Nodes.md @@ -4,6 +4,6 @@ Access properties and data of custom render textures, including size, slice inde | **Topic** | **Description** | |--------------------------------------------------------|----------------------------------------------------------------| -| [Custom Render Texture Slice](Custom-Texture-Slice.md) | Access the custom render texture slice index and cubemap face. | -| [Custom Render Texture Size](Custom-Texture-Size.md) | Access the custom render texture size. | -| [Custom Render Texture Self](Custom-Texture-Self.md) | Access the custom render texture from the previous update. | +| [Custom Render Texture Self](Custom-Render-Texture-Self-Node.md) | Access the custom render texture from the previous update. | +| [Custom Render Texture Size](Custom-Render-Texture-Size-Node.md) | Access the custom render texture size. | +| [Slice Index / Cubemap Face](Slice-Index-Cubemap-Face-Node.md) | Access the custom render texture slice index and cubemap face. | diff --git a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md index fa1feba3608..64e16a28c85 100644 --- a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md +++ b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md @@ -85,7 +85,7 @@ * [Custom Render Texture](Custom-Render-Texture-Nodes.md) * [Self](Custom-Render-Texture-Self-Node.md) * [Size](Custom-Render-Texture-Size-Node.md) - * [Slice](Slice-Index-Cubemap-Face-Node.md) + * [Slice Index / Cubemap Face](Slice-Index-Cubemap-Face-Node.md) * [Dropdown](Dropdown-Node.md) * [Input](Input-Nodes.md) * Basic @@ -126,7 +126,7 @@ * Lighting * [Ambient](Ambient-Node.md) * [Baked GI](Baked-GI-Node.md) - * [Main Light Direction](https://docs.unity3d.com/Packages/com.unity.shadergraph@13.1/manual/Main-Light-Direction-Node.html) + * [Main Light Direction](Main-Light-Direction-Node.md) * [Reflection Probe](Reflection-Probe-Node.md) * Matrix * [Matrix 2x2](Matrix-2x2-Node.md) From 6d59ace8f881255bbec9bb646fffb566c9d85f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Fri, 19 Dec 2025 22:54:36 +0000 Subject: [PATCH 12/15] [6.0][RP Core & URP] Expose context internals for GTF9 test project support --- .../Runtime/GPUDriven/AssemblyInfo.cs | 1 + .../Runtime/GPUDriven/GPUResidentDrawer.Validator.cs | 4 ++-- .../Runtime/GPUDriven/GPUResidentDrawer.cs | 10 +++++++--- .../Runtime/XR/XRGraphicsAutomatedTests.cs | 2 +- .../Runtime/Data/UniversalRenderPipelineAsset.cs | 4 ++-- .../RenderGraph/RenderGraphGraphicsAutomatedTests.cs | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/AssemblyInfo.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/AssemblyInfo.cs index 306bf1bd40a..3441704c446 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/AssemblyInfo.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/AssemblyInfo.cs @@ -2,3 +2,4 @@ [assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor")] [assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor.Tests")] +[assembly: InternalsVisibleTo("UnityEngine.TestTools.Graphics.Contexts")] diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.Validator.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.Validator.cs index d1a4065ae61..ef5b25010d6 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.Validator.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.Validator.cs @@ -89,14 +89,14 @@ internal static bool IsGPUResidentDrawerSupportedBySRP(GPUResidentDrawerSettings message = Strings.allowInEditModeDisabled; return false; } - + // Disable GRD in any external AssetImporter child process. GRD isn't made for AssetImporter workflow/lifetime // Avoid memory leak warning messages and also some future issues (UUM-90039) if (AssetDatabase.IsAssetImportWorkerProcess()) return false; #endif // If we are forcing the system, no need to perform further checks - if (IsForcedOnViaCommandLine()) + if (IsForcedOnViaCommandLine() || MaintainContext) return true; if (GraphicsSettings.currentRenderPipeline is not IGPUResidentRenderPipeline asset) diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.cs index 22791454b0f..b68f923232d 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.cs @@ -113,7 +113,7 @@ public static void UpdateInstanceOccluders(RenderGraph renderGraph, in OccluderP public static void ReinitializeIfNeeded() { #if UNITY_EDITOR - if (!IsForcedOnViaCommandLine() && (IsProjectSupported() != IsEnabled())) + if (!IsForcedOnViaCommandLine() && !MaintainContext && (IsProjectSupported() != IsEnabled())) { Reinitialize(); } @@ -247,7 +247,7 @@ internal static GPUResidentDrawerSettings GetGlobalSettingsFromRPAsset() /// Is GRD forced on via the command line via -force-gpuresidentdrawer. Editor only. /// /// true if forced on - private static bool IsForcedOnViaCommandLine() + internal static bool IsForcedOnViaCommandLine() { #if UNITY_EDITOR return s_IsForcedOnViaCommandLine; @@ -260,7 +260,7 @@ private static bool IsForcedOnViaCommandLine() /// Is occlusion culling forced on via the command line via -force-gpuocclusion. Editor only. /// /// true if forced on - private static bool IsOcclusionForcedOnViaCommandLine() + internal static bool IsOcclusionForcedOnViaCommandLine() { #if UNITY_EDITOR return s_IsOcclusionForcedOnViaCommandLine; @@ -269,6 +269,10 @@ private static bool IsOcclusionForcedOnViaCommandLine() #endif } + internal static bool MaintainContext { get; set; } = false; + + internal static bool ForceOcclusion { get; set; } = false; + internal static void Reinitialize() { var settings = GetGlobalSettingsFromRPAsset(); diff --git a/Packages/com.unity.render-pipelines.core/Runtime/XR/XRGraphicsAutomatedTests.cs b/Packages/com.unity.render-pipelines.core/Runtime/XR/XRGraphicsAutomatedTests.cs index 9cbb50ad6e3..b1c64f65bad 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/XR/XRGraphicsAutomatedTests.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/XR/XRGraphicsAutomatedTests.cs @@ -24,7 +24,7 @@ static bool activatedFromCommandLine /// /// Used by render pipelines to initialize XR tests. /// - public static bool enabled { get; } = activatedFromCommandLine; + public static bool enabled { get; set; } = activatedFromCommandLine; /// /// Set by automated test framework and read by render pipelines. diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs index ff53072d77b..41f83922508 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs @@ -1676,10 +1676,10 @@ static class Strings } /// - public bool IsGPUResidentDrawerSupportedBySRP(out string message, out LogType severty) + public bool IsGPUResidentDrawerSupportedBySRP(out string message, out LogType severity) { message = string.Empty; - severty = LogType.Warning; + severity = LogType.Warning; // if any of the renderers are not set to Forward+ return false foreach (var rendererData in m_RendererDataList) diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RenderGraph/RenderGraphGraphicsAutomatedTests.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RenderGraph/RenderGraphGraphicsAutomatedTests.cs index df3a7efdae6..b1ea13566ec 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/RenderGraph/RenderGraphGraphicsAutomatedTests.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/RenderGraph/RenderGraphGraphicsAutomatedTests.cs @@ -22,7 +22,7 @@ static bool activatedFromCommandLine /// /// Used by render pipelines to initialize RenderGraph tests. /// - public static bool enabled { get; } = activatedFromCommandLine; + public static bool enabled { get; set; } = activatedFromCommandLine; } } From 84c46f568f031291ba35dce2086d41215f998c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Fri, 19 Dec 2025 22:54:36 +0000 Subject: [PATCH 13/15] [6.0] Introduce local.gtf.references shim --- .../Packages/local.gtf.references/package.json | 18 ++++++++++++++++++ .../Projects/HDRP_Tests/Packages/manifest.json | 11 ++++++++++- .../Packages/manifest.json | 11 ++++++++++- .../Packages/manifest.json | 11 ++++++++++- .../Packages/manifest.json | 11 ++++++++++- .../Packages/manifest.json | 11 ++++++++++- .../Packages/manifest.json | 11 ++++++++++- 7 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 Tests/SRPTests/Packages/local.gtf.references/package.json diff --git a/Tests/SRPTests/Packages/local.gtf.references/package.json b/Tests/SRPTests/Packages/local.gtf.references/package.json new file mode 100644 index 00000000000..0e787a179de --- /dev/null +++ b/Tests/SRPTests/Packages/local.gtf.references/package.json @@ -0,0 +1,18 @@ +{ + "displayName": "Graphics Test Framework (published v9)", + "name": "local.gtf.references", + "version": "1.0.0", + "unity": "6000.0", + "description": "Shim package that contains a reference to the com.unity.testframework.graphics package for easier version pinning.", + "keywords": [ + "qa", + "test", + "testing", + "tests", + "graphics" + ], + "category": "Libraries", + "dependencies": { + "com.unity.testframework.graphics": "8.12.0-exp.2" + } +} diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Packages/manifest.json b/Tests/SRPTests/Projects/HDRP_Tests/Packages/manifest.json index afced47110f..1f7a6ca6ef3 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Packages/manifest.json +++ b/Tests/SRPTests/Projects/HDRP_Tests/Packages/manifest.json @@ -11,7 +11,7 @@ "com.unity.render-pipelines.high-definition-config": "file:../../../../../Packages/com.unity.render-pipelines.high-definition-config", "com.unity.shadergraph": "file:../../../../../Packages/com.unity.shadergraph", "local.utf.references": "file:../../../Packages/local.utf.references", - "com.unity.testframework.graphics": "8.12.0-exp.2", + "local.gtf.references": "file:../../../Packages/local.gtf.references", "com.unity.testing.hdrp": "file:../../../Packages/com.unity.testing.hdrp", "com.unity.testing.common-graphics": "file:../../../Packages/com.unity.testing.common-graphics", "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr", @@ -58,5 +58,14 @@ "com.unity.testing.hdrp", "com.unity.testing.xr", "com.unity.shadergraph" + ], + "scopedRegistries": [ + { + "name": "UPM Candidates (GTF)", + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", + "scopes": [ + "com.unity.testframework.graphics" + ] + } ] } diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Packages/manifest.json b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Packages/manifest.json index 60c3ebd78aa..bd77405e2ee 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Packages/manifest.json +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Packages/manifest.json @@ -17,7 +17,7 @@ "com.unity.testing.urp": "file:../../../Packages/com.unity.testing.urp", "com.unity.visualeffectgraph": "file:../../../../../Packages/com.unity.visualeffectgraph", "local.utf.references": "file:../../../Packages/local.utf.references", - "com.unity.testframework.graphics": "8.12.0-exp.2", + "local.gtf.references": "file:../../../Packages/local.gtf.references", "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr", "com.unity.ugui": "2.0.0", "com.unity.modules.ai": "1.0.0", @@ -57,5 +57,14 @@ "com.unity.render-pipelines.universal", "com.unity.testing.xr", "com.unity.testing.urp" + ], + "scopedRegistries": [ + { + "name": "UPM Candidates (GTF)", + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", + "scopes": [ + "com.unity.testframework.graphics" + ] + } ] } diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Packages/manifest.json b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Packages/manifest.json index b5fd395ebbd..2a1a9bddcc4 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Packages/manifest.json +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Packages/manifest.json @@ -15,7 +15,7 @@ "com.unity.shadergraph": "file:../../../../../Packages/com.unity.shadergraph", "com.unity.rendering.light-transport": "file:../../../../../Packages/com.unity.rendering.light-transport", "local.utf.references": "file:../../../Packages/local.utf.references", - "com.unity.testframework.graphics": "8.12.0-exp.2", + "local.gtf.references": "file:../../../Packages/local.gtf.references", "com.unity.testing.urp": "file:../../../Packages/com.unity.testing.urp", "com.unity.testing.common-graphics": "file:../../../Packages/com.unity.testing.common-graphics", "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr", @@ -57,5 +57,14 @@ "com.unity.render-pipelines.universal", "com.unity.testing.xr", "com.unity.testing.urp" + ], + "scopedRegistries": [ + { + "name": "UPM Candidates (GTF)", + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", + "scopes": [ + "com.unity.testframework.graphics" + ] + } ] } diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Lighting/Packages/manifest.json b/Tests/SRPTests/Projects/UniversalGraphicsTest_Lighting/Packages/manifest.json index a847c0f2f0d..6272f7c6403 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_Lighting/Packages/manifest.json +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_Lighting/Packages/manifest.json @@ -14,7 +14,7 @@ "com.unity.shadergraph": "file:../../../../../Packages/com.unity.shadergraph", "com.unity.rendering.light-transport": "file:../../../../../Packages/com.unity.rendering.light-transport", "local.utf.references": "file:../../../Packages/local.utf.references", - "com.unity.testframework.graphics": "8.12.0-exp.2", + "local.gtf.references": "file:../../../Packages/local.gtf.references", "com.unity.testing.urp": "file:../../../Packages/com.unity.testing.urp", "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr", "com.unity.ugui": "2.0.0", @@ -55,5 +55,14 @@ "com.unity.render-pipelines.universal", "com.unity.testing.xr", "com.unity.testing.urp" + ], + "scopedRegistries": [ + { + "name": "UPM Candidates (GTF)", + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", + "scopes": [ + "com.unity.testframework.graphics" + ] + } ] } diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Packages/manifest.json b/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Packages/manifest.json index d62ad97bc29..3335c535708 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Packages/manifest.json +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Packages/manifest.json @@ -15,7 +15,7 @@ "com.unity.shadergraph": "file:../../../../../Packages/com.unity.shadergraph", "com.unity.rendering.light-transport": "file:../../../../../Packages/com.unity.rendering.light-transport", "local.utf.references": "file:../../../Packages/local.utf.references", - "com.unity.testframework.graphics": "8.12.0-exp.2", + "local.gtf.references": "file:../../../Packages/local.gtf.references", "com.unity.testing.urp": "file:../../../Packages/com.unity.testing.urp", "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr", "com.unity.ugui": "2.0.0", @@ -56,5 +56,14 @@ "com.unity.render-pipelines.universal", "com.unity.testing.xr", "com.unity.testing.urp" + ], + "scopedRegistries": [ + { + "name": "UPM Candidates (GTF)", + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", + "scopes": [ + "com.unity.testframework.graphics" + ] + } ] } diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Terrain/Packages/manifest.json b/Tests/SRPTests/Projects/UniversalGraphicsTest_Terrain/Packages/manifest.json index fd1656e562a..2df3845d080 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_Terrain/Packages/manifest.json +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_Terrain/Packages/manifest.json @@ -14,7 +14,7 @@ "com.unity.shadergraph": "file:../../../../../Packages/com.unity.shadergraph", "com.unity.rendering.light-transport": "file:../../../../../Packages/com.unity.rendering.light-transport", "local.utf.references": "file:../../../Packages/local.utf.references", - "com.unity.testframework.graphics": "8.12.0-exp.2", + "local.gtf.references": "file:../../../Packages/local.gtf.references", "com.unity.testing.urp": "file:../../../Packages/com.unity.testing.urp", "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr", "com.unity.ugui": "2.0.0", @@ -55,5 +55,14 @@ "com.unity.render-pipelines.universal", "com.unity.testing.xr", "com.unity.testing.urp" + ], + "scopedRegistries": [ + { + "name": "UPM Candidates (GTF)", + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", + "scopes": [ + "com.unity.testframework.graphics" + ] + } ] } From 5d5e19424db615dbb03b8a6e12bced0373c526d2 Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Wed, 24 Dec 2025 16:44:22 +0000 Subject: [PATCH 14/15] [Port] [6000.0] [Shader Graph] Toolbar Icons Fixes --- .../Editor/Drawing/Views/GraphEditorView.cs | 57 +++++++-- .../Editor/Resources/Icons/blackboard.png | Bin 2375 -> 2433 bytes .../Resources/Icons/blackboard.png.meta | 41 ++++-- .../Editor/Resources/Icons/blackboard@2x.png | Bin 346 -> 943 bytes .../Resources/Icons/blackboard@2x.png.meta | 41 ++++-- .../Resources/Icons/blackboard_dark.png | Bin 0 -> 2375 bytes .../Resources/Icons/blackboard_dark.png.meta | 117 ++++++++++++++++++ .../Resources/Icons/blackboard_dark@2x.png | Bin 0 -> 928 bytes .../Icons/blackboard_dark@2x.png.meta | 117 ++++++++++++++++++ 9 files changed, 338 insertions(+), 35 deletions(-) create mode 100644 Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark.png create mode 100644 Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark.png.meta create mode 100644 Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark@2x.png create mode 100644 Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark@2x.png.meta diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs index 621923b2142..6d26f8e3a9d 100644 --- a/Packages/com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs +++ b/Packages/com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs @@ -153,6 +153,42 @@ void InstallSample(string sampleName) private static readonly ProfilerMarker AddGroupsMarker = new ProfilerMarker("AddGroups"); private static readonly ProfilerMarker AddStickyNotesMarker = new ProfilerMarker("AddStickyNotes"); + + static GUIContent saveIcon; + static GUIContent SaveIcon => + saveIcon ??= new GUIContent(EditorGUIUtility.IconContent("SaveActive").image, "Save"); + + static GUIContent dropdownIcon; + static GUIContent DropdownIcon => + dropdownIcon ??= EditorGUIUtility.IconContent("Dropdown"); + + static GUIContent blackboardIcon; + static GUIContent BlackboardIcon + { + get + { + if (blackboardIcon == null) + { + var suffix = (EditorGUIUtility.isProSkin ? "_dark" : "") + (EditorGUIUtility.pixelsPerPoint >= 2 ? "@2x" : ""); + var path = $"Icons/blackboard{suffix}"; + blackboardIcon = new GUIContent(Resources.Load(path), "Blackboard"); + } + return blackboardIcon; + } + } + + static GUIContent inspectorIcon; + static GUIContent InspectorIcon => + inspectorIcon ??= new GUIContent(EditorGUIUtility.IconContent("UnityEditor.InspectorWindow").image, "Graph Inspector"); + + static GUIContent previewIcon; + static GUIContent PreviewIcon => + previewIcon ??= new GUIContent(EditorGUIUtility.IconContent("PreMatSphere").image, "Main Preview"); + + static GUIContent helpIcon; + static GUIContent HelpIcon => + helpIcon ??= new GUIContent(EditorGUIUtility.IconContent("_Help").image, "Open Shader Graph User Manual"); + public GraphEditorView(EditorWindow editorWindow, GraphData graph, MessageManager messageManager, string graphName) { m_GraphViewGroupTitleChanged = OnGroupTitleChanged; @@ -172,7 +208,6 @@ public GraphEditorView(EditorWindow editorWindow, GraphData graph, MessageManage m_UserViewSettings = JsonUtility.FromJson(serializedSettings) ?? new UserViewSettings(); m_ColorManager = new ColorManager(m_UserViewSettings.colorProvider); - List toolbarExtensions = new(); foreach (var type in TypeCache.GetTypesDerivedFrom(typeof(IShaderGraphToolbarExtension)).Where(e => !e.IsGenericType)) { @@ -183,12 +218,12 @@ public GraphEditorView(EditorWindow editorWindow, GraphData graph, MessageManage var toolbar = new IMGUIContainer(() => { GUILayout.BeginHorizontal(EditorStyles.toolbar); - if (GUILayout.Button(new GUIContent(EditorGUIUtility.FindTexture("SaveActive"), "Save"), EditorStyles.toolbarButton)) + if (GUILayout.Button(SaveIcon, EditorStyles.toolbarButton)) { if (saveRequested != null) saveRequested(); } - if (GUILayout.Button(EditorResources.Load("d_dropdown"), EditorStyles.toolbarButton)) + if (GUILayout.Button(DropdownIcon, EditorStyles.toolbarButton)) { GenericMenu menu = new GenericMenu(); menu.AddItem(new GUIContent("Save As..."), false, () => saveAsRequested()); @@ -218,22 +253,22 @@ public GraphEditorView(EditorWindow editorWindow, GraphData graph, MessageManage GUILayout.Label("Color Mode"); var newColorIndex = EditorGUILayout.Popup(m_ColorManager.activeIndex, colorProviders, GUILayout.Width(100f)); GUILayout.Space(4); - m_UserViewSettings.isBlackboardVisible = GUILayout.Toggle(m_UserViewSettings.isBlackboardVisible, new GUIContent(Resources.Load("Icons/blackboard"), "Blackboard"), EditorStyles.toolbarButton); + + m_UserViewSettings.isBlackboardVisible = GUILayout.Toggle(m_UserViewSettings.isBlackboardVisible, BlackboardIcon, EditorStyles.toolbarButton); GUILayout.Space(6); - m_UserViewSettings.isInspectorVisible = GUILayout.Toggle(m_UserViewSettings.isInspectorVisible, new GUIContent(EditorGUIUtility.TrIconContent("d_UnityEditor.InspectorWindow").image, "Graph Inspector"), EditorStyles.toolbarButton); + m_UserViewSettings.isInspectorVisible = GUILayout.Toggle(m_UserViewSettings.isInspectorVisible, InspectorIcon, EditorStyles.toolbarButton); GUILayout.Space(6); - m_UserViewSettings.isPreviewVisible = GUILayout.Toggle(m_UserViewSettings.isPreviewVisible, new GUIContent(EditorGUIUtility.FindTexture("PreMatSphere"), "Main Preview"), EditorStyles.toolbarButton); + m_UserViewSettings.isPreviewVisible = GUILayout.Toggle(m_UserViewSettings.isPreviewVisible, PreviewIcon, EditorStyles.toolbarButton); - if (GUILayout.Button(new GUIContent(EditorGUIUtility.TrIconContent("_Help").image, "Open Shader Graph User Manual"), EditorStyles.toolbarButton)) + if (GUILayout.Button(HelpIcon, EditorStyles.toolbarButton)) { Application.OpenURL(UnityEngine.Rendering.ShaderGraph.Documentation.GetPageLink("index")); - //Application.OpenURL("https://docs.unity3d.com/Packages/com.unity.shadergraph@17.0/manual/index.html"); // TODO : point to latest? } - if (GUILayout.Button(EditorResources.Load("d_dropdown"), EditorStyles.toolbarButton)) + if (GUILayout.Button(DropdownIcon, EditorStyles.toolbarButton)) { GenericMenu menu = new GenericMenu(); menu.AddItem(new GUIContent("Shader Graph Samples"), false, () => @@ -257,10 +292,6 @@ public GraphEditorView(EditorWindow editorWindow, GraphData graph, MessageManage { Application.OpenURL("https://forum.unity.com/forums/shader-graph.346/"); }); - menu.AddItem(new GUIContent("Shader Graph Roadmap"), false, () => - { - Application.OpenURL("https://portal.productboard.com/unity/1-unity-platform-rendering-visual-effects/tabs/7-shader-graph"); - }); menu.ShowAsContext(); } diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard.png b/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard.png index a1890e476f61e38760f0e9282276b65090028cb4..ef9cf24ebf2554e64ea15125b744c6b4c46c646d 100644 GIT binary patch delta 230 zcmVFa03xMy zGsav)2ybmdag6Z=hen(9Sn1+vnjW={kpg&%thHy1TW#M06tG?d=Z+D^+*!hbFD-nj z|M$%n=%0b<7P9q)Iq2VYsuC;r{zO2II)@TT1`4M&kR?G;(^b07*qoM6N<$f;u;A(EtDd delta 172 zcmV;d08{^g6UP#;qzHeGNklwOuR|t9)_3QpLF_FGf z)RgX9tu;Bl3M`+P=`a-Rx-&u(XJs1#*qhD3A=<1>(KCV~&<5=4dJneiyJpM+7Qtgl z|I8~Z&$z~)15F$6hh~$BiO!&U{>%taTZ1?4->;Atg$V0<2FoPaRXveSwHhaZ3NWGa amg5UM!`;a;Njzo%0000W0$H z3m6e5E?|PIR#?D{V1u;9@8SOdq&N#aB8wRqxP?KOkzv*x37~0_nIRD+5xzcF$@#f@ zi7EL>sd^Q;1t47vHWgMtW^QUpqC!P(PF}H9g{=};g%ywu64qBz04piUwpEJo4N!2- zFG^J~(=*UBP_pAvP*AWbN=dT{a&d!d2l8x{GD=Dctn~HE%ggo3jrH=2()A53EiLs8 zjP#9+bb%^#i!1X=5-W7`ij^UTz|3(;Elw`VEGWs$&r<-Io0ybeT4JlD1hNPYAnq*5 zOhed|R}A$Q(1ZFQ8GS=N1AVyJK&>_)Q7iwV%v7MwAoJ}EZNMr~#Gv-r=z}araty?$ zU{Rn~?YM08;lXCdB^mdS9T>>*o-U3d5u9&>z4KZOcvM;69Sqfq*pQun>0Zi}*;}m5 zGS(fkWms8v(Sl2Ea=+WGGC}V^qbGZxi{B0oRrO-^V*OXmdaUqGTjGy1Upe`97~b>d zU}&tpzy8<^?>^3igN){BkFGGNt2b91y<~E>{KT62^22&x&e|!Y9Qxs6clt?b?0&z? zEC-)>T-~wSp{L?n^oKuY2Mu~AKW@F2smjL|G%0&;>byBqMTFO}>M(8JvZgw+jMw=F z*I~D4ckP+SZ(VCpJHsGk+j8Wdp7pJ(Pkg4?%+oF|JLr-tF5}R2GSc~j&T|81o| zzUw}?p7nHM@q)wy^(h>&+!J)Z?Z3P2?c7hLTVl?u=Eq()-&MYF<~RAY=m!@{Is||1 z`=4?9+i`J5c^j4a&wqA*O^P~jSMtDd5v78K9#;c+9V|i}j3*v0HCAX%+B>!4|8_I& wf3?>n*E`AjTsC`|_P5C8B+IF9Py(e|Pgg&ebxsLQ00x^eY5)KL delta 319 zcmV-F0l@yR2igLVB!3BTNLh0L01FZT01FZU(%pXi0003DNkl91P2*GK*H_co`ZU8PVAy)21L~dG$YJeZ+4nQKJ4{Lyxn|}Z}EyQ3npJI&38la`d zLkBcrZMNH8i7_T3nxJ&zR{)DS3bU>4iY3HQC{i@9aR6YC?#>yk=Cxw$=VslVJM3Aw zjRre)iHN4B@4#Q+_z`FXtqAbi5`K@sa%Dv1eOqL!%Q>H{=0M>k)C9~tkK_1RI%UrJ zv@FZDrK^WO#W=+PuZC#RR|Mu#B0aBcH%glGY~kk@5#C6 z`_8%NoO|y|`Ov|!*mw*8Fjkr?R`9rkywOqo-Tmiv84nS=a&QKmxp41Q{O5N#U(zHA zJb>jW*cQ113=F$f~n^CX-<~ffWQAThR8B z;mB>;u=jc-U7jMe6-zfA9T^nim1}6x$;IQuk^gvcs*3N&T(lal7gb?l12&=I*euWR zY#0u&)(0APCmT2~Y+E)lh#Lfwq?^N<%}}K6%pSul=wu|+piH7cO0aLbY zNIE1J@3x4)XZ$TeFm9)bHqxAyY{BU|Zliz9VHlD004$>foBlZfjsqH|RR{UgZNfk=q!a7T)I!YnVoewF?8w8^Jn*b|DJR)aXkL*=(V4hZ~JKDQ*C|dt}m3*_4WPxzxnv9 z)5FrlZzr@@S5_{pEpM(z%SWG^`sK$DR_}fxy0JWZ?$TqqlhTLd_dOfq-u~m%Pum~- W^77Y0DXWnizBGHNcxL9w<9`D#;Go_B literal 0 HcmV?d00001 diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark.png.meta b/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark.png.meta new file mode 100644 index 00000000000..87c105f225a --- /dev/null +++ b/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 2162b791346804a7792168e6fc526ced +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark@2x.png b/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..8d845e531e6e3745aa7fff519b17f664be477793 GIT binary patch literal 928 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EvXTnX}-P; zT0k}j11qBt12aeo5Hc`IF|dN!3=Ce3(r|VVqXtwB69YqgCIbspO%#v@0S_Ps>W0$H z3m6e5E?|PIR#?D{V1u;9@8SOdq&N#aB8wRqxP?KOkzv*x37~0_nIRD+5xzcF$@#f@ zi7EL>sd^Q;1t47vHWgMtW^QUpqC!P(PF}H9g{=};g%ywu64qBz04piUwpEJo4N!2- zFG^J~(=*UBP_pAvP*AWbN=dT{a&d!d2l8x{GD=Dctn~HE%ggo3jrH=2()A53EiLs8 zjP#9+bb%^#i!1X=5-W7`ij^UTz|3(;Elw`VEGWs$&r<-Io0ybeT4JlD1hNPYAnq*5 zOhed|R}A$Q(1ZFQ8GS=N1AVyJK&>_)Q7iwV%v7MwAoJ}EZNMr~#Gv-r=z}araty?$ zU{Rn~?YM08;lXCdB^mdS9T>;~o-U3d5u9&BE($g)@Q9ifFo(Tld8<~oCGSGuE2dX$ zw`}}&%y2tc75%VvacgTe~DWM4f#UUb~ literal 0 HcmV?d00001 diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark@2x.png.meta b/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark@2x.png.meta new file mode 100644 index 00000000000..47cd3253e57 --- /dev/null +++ b/Packages/com.unity.shadergraph/Editor/Resources/Icons/blackboard_dark@2x.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: aa09d480b04b3437db2ba9c9cdbc77be +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: From 5be8b2efb652b413746d7ef862ed0d4c7b7c0fa7 Mon Sep 17 00:00:00 2001 From: Kirill Titov Date: Fri, 2 Jan 2026 17:28:31 +0000 Subject: [PATCH 15/15] [Port] [6000.0] Removed old DebugLevel field from URP asset --- .../SerializedUniversalRenderPipelineAsset.cs | 2 -- .../UniversalRenderPipelineAssetUI.Drawers.cs | 1 - .../UniversalRenderPipelineAssetUI.Skin.cs | 1 - 3 files changed, 4 deletions(-) diff --git a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/SerializedUniversalRenderPipelineAsset.cs b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/SerializedUniversalRenderPipelineAsset.cs index d75c71bcbf2..f9c489e5199 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/SerializedUniversalRenderPipelineAsset.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/SerializedUniversalRenderPipelineAsset.cs @@ -71,7 +71,6 @@ internal class SerializedUniversalRenderPipelineAsset public SerializedProperty mixedLightingSupportedProp { get; } public SerializedProperty useRenderingLayers { get; } public SerializedProperty supportsLightCookies { get; } - public SerializedProperty debugLevelProp { get; } public SerializedProperty volumeFrameworkUpdateModeProp { get; } public SerializedProperty volumeProfileProp { get; } @@ -163,7 +162,6 @@ public SerializedUniversalRenderPipelineAsset(SerializedObject serializedObject) mixedLightingSupportedProp = serializedObject.FindProperty("m_MixedLightingSupported"); useRenderingLayers = serializedObject.FindProperty("m_SupportsLightLayers"); supportsLightCookies = serializedObject.FindProperty("m_SupportsLightCookies"); - debugLevelProp = serializedObject.FindProperty("m_DebugLevel"); volumeFrameworkUpdateModeProp = serializedObject.FindProperty("m_VolumeFrameworkUpdateMode"); volumeProfileProp = serializedObject.FindProperty("m_VolumeProfile"); diff --git a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Drawers.cs b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Drawers.cs index 8468d798f59..8fadab49b1f 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Drawers.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Drawers.cs @@ -171,7 +171,6 @@ static void DrawRenderingAdditional(SerializedUniversalRenderPipelineAsset seria { EditorGUILayout.PropertyField(serialized.srpBatcher, Styles.srpBatcher); EditorGUILayout.PropertyField(serialized.supportsDynamicBatching, Styles.dynamicBatching); - EditorGUILayout.PropertyField(serialized.debugLevelProp, Styles.debugLevel); EditorGUILayout.PropertyField(serialized.storeActionsOptimizationProperty, Styles.storeActionsOptimizationText); } diff --git a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs index 65f7eca605b..178f4e58e95 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs @@ -31,7 +31,6 @@ internal static class Styles public static GUIContent srpBatcher = EditorGUIUtility.TrTextContent("SRP Batcher", "If enabled, the render pipeline uses the SRP batcher."); public static GUIContent storeActionsOptimizationText = EditorGUIUtility.TrTextContent("Store Actions", "Sets the store actions policy on tile based GPUs. Affects render targets memory usage and will impact performance."); public static GUIContent dynamicBatching = EditorGUIUtility.TrTextContent("Dynamic Batching", "If enabled, the render pipeline will batch drawcalls with few triangles together by copying their vertex buffers into a shared buffer on a per-frame basis."); - public static GUIContent debugLevel = EditorGUIUtility.TrTextContent("Debug Level", "Controls the level of debug information generated by the render pipeline. When Profiling is selected, the pipeline provides detailed profiling tags."); // Quality public static GUIContent hdrText = EditorGUIUtility.TrTextContent("HDR", "Controls the global HDR settings.");