[ShaderGraph] [Backport 10.3] Fix texture associated state (samplerstate, TexelSize) for subgraphs, CFNs

com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl

@@ -0,0 +1,101 @@
+#ifndef UNITY_TEXTURE_INCLUDED
+#define UNITY_TEXTURE_INCLUDED
+
+#ifdef SHADER_API_GLES
+    #define SAMPLERDECL(n) GLES2UnsupportedSamplerState n;
+#else
+    #define SAMPLERDECL(n) SAMPLER(n);
+#endif
+
+struct GLES2UnsupportedSamplerState
+{
+};
+
+struct UnitySamplerState
+{
+    SAMPLERDECL(samplerstate)
+};
+
+#ifdef SHADER_API_GLES
+    #define UnityBuildSamplerStateStruct(n) UnityBuildSamplerStateStructInternal()
+#else
+    #define UnityBuildSamplerStateStruct(n) UnityBuildSamplerStateStructInternal(n)
+#endif
+
+UnitySamplerState UnityBuildSamplerStateStructInternal(SAMPLER(samplerstate))
+{
+    UnitySamplerState result;
+    ASSIGN_SAMPLER(result.samplerstate, samplerstate);
+    return result;
+}
+
+struct UnityTexture2D
+{
+    TEXTURE2D(tex);
+    SAMPLERDECL(samplerstate)
+    float4 texelSize;
+    float4 scaleTranslate;
+};
+
+#define UnityBuildTexture2DStruct(n) UnityBuildTexture2DStructInternal(TEXTURE2D_ARGS(n, sampler##n), n##_TexelSize, n##_ST)
+#define UnityBuildTexture2DStructNoScale(n) UnityBuildTexture2DStructInternal(TEXTURE2D_ARGS(n, sampler##n), n##_TexelSize, float4(1, 1, 0, 0))
+UnityTexture2D UnityBuildTexture2DStructInternal(TEXTURE2D_PARAM(tex, samplerstate), float4 texelSize, float4 scaleTranslate)
+{
+    UnityTexture2D result;
+    result.tex = tex;
+    ASSIGN_SAMPLER(result.samplerstate, samplerstate);
+    result.texelSize = texelSize;
+    result.scaleTranslate = scaleTranslate;
+    return result;
+}
+
+struct UnityTexture2DArray
+{
+    TEXTURE2D_ARRAY(tex);
+    SAMPLERDECL(samplerstate)
+};
+
+#define UnityBuildTexture2DArrayStruct(n) UnityBuildTexture2DArrayStructInternal(TEXTURE2D_ARRAY_ARGS(n, sampler##n))
+UnityTexture2DArray UnityBuildTexture2DArrayStructInternal(TEXTURE2D_ARRAY_PARAM(tex, samplerstate))
+{
+    UnityTexture2DArray result;
+    result.tex = tex;
+    ASSIGN_SAMPLER(result.samplerstate, samplerstate);
+    return result;
+}
+
+
+struct UnityTextureCube
+{
+    TEXTURECUBE(tex);
+    SAMPLERDECL(samplerstate)
+};
+
+#define UnityBuildTextureCubeStruct(n) UnityBuildTextureCubeStructInternal(TEXTURECUBE_ARGS(n, sampler##n))
+UnityTextureCube UnityBuildTextureCubeStructInternal(TEXTURECUBE_PARAM(tex, samplerstate))
+{
+    UnityTextureCube result;
+    result.tex = tex;
+    ASSIGN_SAMPLER(result.samplerstate, samplerstate);
+    return result;
+}
+
+
+struct UnityTexture3D
+{
+    TEXTURE3D(tex);
+    SAMPLERDECL(samplerstate)
+};
+
+#define UnityBuildTexture3DStruct(n) UnityBuildTexture3DStructInternal(TEXTURE3D_ARGS(n, sampler##n))
+UnityTexture3D UnityBuildTexture3DStructInternal(TEXTURE3D_PARAM(tex, samplerstate))
+{
+    UnityTexture3D result;
+    result.tex = tex;
+    ASSIGN_SAMPLER(result.samplerstate, samplerstate);
+    return result;
+}
+
+#undef SAMPLERDECL
+
+#endif // UNITY_TEXTURE_INCLUDED

com.unity.render-pipelines.high-definition/Editor/Material/Decal/ShaderGraph/DecalPass.template

@@ -25,6 +25,7 @@ Pass
     $splice(GraphKeywords)
 
     #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
+    #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl"
     #include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPass.cs.hlsl"
 
     // Defines

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Templates/ShaderPass.template

@@ -25,6 +25,7 @@ Pass
     $splice(GraphKeywords)
 
     #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
+    #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl"
     #include "Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl"
     #include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/FragInputs.hlsl"
     #include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPass.cs.hlsl"

com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/VFXPasses.template

@@ -14,6 +14,7 @@ ${VFXBegin:VFXPassVelocityAdditionalPragma}#pragma multi_compile _ WRITE_MSAA_DE
 
 ${VFXBegin:VFXShaderGraphFunctionsInclude}
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/EntityLighting.hlsl"

com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs

@@ -599,6 +599,7 @@ static class CorePragmas
     static class CoreIncludes
     {
         const string kColor = "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl";
+        const string kTexture = "Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl";
         const string kCore = "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl";
         const string kLighting = "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl";
         const string kGraphFunctions = "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl";
@@ -612,6 +613,7 @@ static class CoreIncludes
         public static readonly IncludeCollection CorePregraph = new IncludeCollection
         {
             { kColor, IncludeLocation.Pregraph },
+            { kTexture, IncludeLocation.Pregraph },
             { kCore, IncludeLocation.Pregraph },
             { kLighting, IncludeLocation.Pregraph },
             { kTextureStack, IncludeLocation.Pregraph },        // TODO: put this on a conditional

com.unity.shadergraph/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this package are documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [10.3.0] - 2020-11-12
+
+### Added
+
+### Changed
+- Texture and SamplerState types are now HLSL structures (defined in com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl).  CustomFunctionNode use of the old plain types is supported, but the user should upgrade to structures to avoid bugs.
+
+### Fixed
+- Fixed using TexelSize or reading sampler states from Textures output from a Subgraph or Custom Function Node [1284036]
+- Shaders using SamplerState types now compile with GLES2 (SamplerStates are ignored, falls back to Texture-associated sampler state) [1292031]
+
 ## [10.2.0] - 2020-10-19
 
 ### Added

com.unity.shadergraph/Editor/AssemblyInfo.cs

@@ -5,3 +5,4 @@
 [assembly: InternalsVisibleTo("Unity.ShaderGraph.GraphicsTests")]
 [assembly: InternalsVisibleTo("Unity.ShaderGraph.Editor.GraphicsTests")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor")]
+[assembly: InternalsVisibleTo("Unity.VisualEffectGraph.Editor")]

com.unity.shadergraph/Editor/Data/Graphs/AbstractShaderProperty.cs

@@ -22,6 +22,11 @@ public bool gpuInstanced
             set { }
         }
 
+        internal virtual string GetHLSLVariableName(bool isSubgraphProperty)
+        {
+            return referenceName;
+        }
+
         // NOTE: this does not tell you the HLSLDeclaration of the entire property...
         // instead, it tells you what the DEFAULT HLSL Declaration would be, IF the property makes use of the default
         // to check ACTUAL HLSL Declaration types, enumerate the HLSL Properties and check their HLSLDeclarations...

com.unity.shadergraph/Editor/Data/Graphs/CubemapInputMaterialSlot.cs

@@ -42,21 +42,21 @@ public override VisualElement InstantiateControl()
 
         public override string GetDefaultValue(GenerationMode generationMode)
         {
-            var matOwner = owner as AbstractMaterialNode;
-            if (matOwner == null)
+            var nodeOwner = owner as AbstractMaterialNode;
+            if (nodeOwner == null)
                 throw new Exception(string.Format("Slot {0} either has no owner, or the owner is not a {1}", this, typeof(AbstractMaterialNode)));
 
-            return matOwner.GetVariableNameForSlot(id);
+            return $"UnityBuildTextureCubeStruct({nodeOwner.GetVariableNameForSlot(id)})";
         }
 
         public override void AddDefaultProperty(PropertyCollector properties, GenerationMode generationMode)
         {
-            var matOwner = owner as AbstractMaterialNode;
-            if (matOwner == null)
+            var nodeOwner = owner as AbstractMaterialNode;
+            if (nodeOwner == null)
                 throw new Exception(string.Format("Slot {0} either has no owner, or the owner is not a {1}", this, typeof(AbstractMaterialNode)));
 
             var prop = new CubemapShaderProperty();
-            prop.overrideReferenceName = matOwner.GetVariableNameForSlot(id);
+            prop.overrideReferenceName = nodeOwner.GetVariableNameForSlot(id);
             prop.modifiable = false;
             prop.generatePropertyBlock = true;
             prop.value.cubemap = cubemap;
@@ -77,7 +77,10 @@ public override void CopyValuesFrom(MaterialSlot foundSlot)
         {
             var slot = foundSlot as CubemapInputMaterialSlot;
             if (slot != null)
+            {
                 m_Cubemap = slot.m_Cubemap;
+                m_BareResource = slot.m_BareResource;
+            }
         }
     }
 }

com.unity.shadergraph/Editor/Data/Graphs/CubemapMaterialSlot.cs

@@ -1,5 +1,6 @@
 using System;
 using UnityEditor.Graphing;
+using UnityEngine;
 
 namespace UnityEditor.ShaderGraph
 {
@@ -19,6 +20,22 @@ public CubemapMaterialSlot(
             : base(slotId, displayName, shaderOutputName, slotType, stageCapability, hidden)
         {}
 
+        [SerializeField]
+        internal bool m_BareResource = false;
+        internal override bool bareResource
+        {
+            get { return m_BareResource; }
+            set { m_BareResource = value; }
+        }
+
+        public override string GetHLSLVariableType()
+        {
+            if (m_BareResource)
+                return "TextureCube";
+            else
+                return concreteValueType.ToShaderString();
+        }
+
         public override SlotValueType valueType { get { return SlotValueType.Cubemap; } }
         public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Cubemap; } }
         public override bool isDefaultValue => true;

com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs

@@ -38,7 +38,15 @@ internal override void ForeachHLSLProperty(Action<HLSLProperty> action)
 
         internal override string GetPropertyAsArgumentString()
         {
-            return $"TEXTURECUBE_PARAM({referenceName}, sampler{referenceName})";
+            return "UnityTextureCube " + referenceName;
+        }
+
+        internal override string GetHLSLVariableName(bool isSubgraphProperty)
+        {
+            if (isSubgraphProperty)
+                return referenceName;
+            else
+                return $"UnityBuildTextureCubeStruct({referenceName})";
         }
 
         [SerializeField]

com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs

@@ -291,6 +291,11 @@ public virtual void GetPreviewProperties(List<PreviewProperty> properties, strin
             properties.Add(default(PreviewProperty));
         }
 
+        public virtual string GetHLSLVariableType()
+        {
+            return concreteValueType.ToShaderString();
+        }
+
         public abstract void CopyValuesFrom(MaterialSlot foundSlot);
 
         public bool Equals(MaterialSlot other)
@@ -314,6 +319,10 @@ public override int GetHashCode()
             }
         }
 
+        // this tracks old CustomFunctionNode slots that are expecting the old bare resource inputs
+        // rather than the new structure-based inputs
+        internal virtual bool bareResource { get { return false; } set { } }
+
         public virtual void CopyDefaultValue(MaterialSlot other)
         {
             m_Id = other.m_Id;

com.unity.shadergraph/Editor/Data/Graphs/SamplerStateMaterialSlot.cs

@@ -1,5 +1,6 @@
 using System;
 using UnityEditor.Graphing;
+using UnityEngine;
 
 namespace UnityEditor.ShaderGraph
 {
@@ -21,13 +22,29 @@ public SamplerStateMaterialSlot(
         {
         }
 
+        [SerializeField]
+        internal bool m_BareResource = false;
+        internal override bool bareResource
+        {
+            get { return m_BareResource; }
+            set { m_BareResource = value; }
+        }
+
+        public override string GetHLSLVariableType()
+        {
+            if (m_BareResource)
+                return "SamplerState";
+            else
+                return concreteValueType.ToShaderString();
+        }
+
         public override string GetDefaultValue(GenerationMode generationMode)
         {
-            var matOwner = owner as AbstractMaterialNode;
-            if (matOwner == null)
+            var nodeOwner = owner as AbstractMaterialNode;
+            if (nodeOwner == null)
                 throw new Exception(string.Format("Slot {0} either has no owner, or the owner is not a {1}", this, typeof(AbstractMaterialNode)));
 
-            return $"{matOwner.GetVariableNameForSlot(id)}_Linear_Repeat";
+            return "UnityBuildSamplerStateStruct(SamplerState_Linear_Repeat)";
         }
 
         public override SlotValueType valueType { get { return SlotValueType.SamplerState; } }
@@ -36,8 +53,8 @@ public override string GetDefaultValue(GenerationMode generationMode)
 
         public override void AddDefaultProperty(PropertyCollector properties, GenerationMode generationMode)
         {
-            var matOwner = owner as AbstractMaterialNode;
-            if (matOwner == null)
+            var nodeOwner = owner as AbstractMaterialNode;
+            if (nodeOwner == null)
                 throw new Exception(string.Format("Slot {0} either has no owner, or the owner is not a {1}", this, typeof(AbstractMaterialNode)));
 
             properties.AddShaderProperty(new SamplerStateShaderProperty()
@@ -47,7 +64,7 @@ public override void AddDefaultProperty(PropertyCollector properties, Generation
                     filter = TextureSamplerState.FilterMode.Linear,
                     wrap = TextureSamplerState.WrapMode.Repeat
                 },
-                overrideReferenceName = $"{matOwner.GetVariableNameForSlot(id)}_Linear_Repeat",
+                overrideReferenceName = "SamplerState_Linear_Repeat",
                 generatePropertyBlock = false,
             });
         }

com.unity.shadergraph/Editor/Data/Graphs/SamplerStateShaderProperty.cs

@@ -24,7 +24,7 @@ public override TextureSamplerState value
             get => base.value;
             set
             {
-                overrideReferenceName = $"{concreteShaderValueType.ToShaderString()}_{value.filter}_{value.wrap}";
+                overrideReferenceName = $"SamplerState_{value.filter}_{value.wrap}";
                 base.value = value;
             }
         }
@@ -38,7 +38,15 @@ internal override void ForeachHLSLProperty(Action<HLSLProperty> action)
 
         internal override string GetPropertyAsArgumentString()
         {
-            return $"SamplerState {referenceName}";
+            return $"UnitySamplerState {referenceName}";
+        }
+
+        internal override string GetHLSLVariableName(bool isSubgraphProperty)
+        {
+            if (isSubgraphProperty)
+                return referenceName;
+            else
+                return $"UnityBuildSamplerStateStruct({referenceName})";
         }
 
         internal override AbstractMaterialNode ToConcreteNode()