Merge pull request #309 from Unity-Technologies/Branch_FixPS4_TexInCB

Removed texture declaration from CBuffer in Lit.shader (fixes broken parameter bindings on PS4 caused by shader reflection code problem on PS4 in this case).

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl

+// ===========================================================================
+//                              WARNING:
+// On PS4, texture/sampler declarations need to be outside of CBuffers
+// Otherwise those parameters are not bound correctly at runtime.
+// ===========================================================================
+
+#ifndef LAYERED_LIT_SHADER
+
+TEXTURE2D(_DiffuseLightingMap);
+SAMPLER2D(sampler_DiffuseLightingMap);
+
+TEXTURE2D(_DistortionVectorMap);
+SAMPLER2D(sampler_DistortionVectorMap);
+
+TEXTURE2D(_EmissiveColorMap);
+SAMPLER2D(sampler_EmissiveColorMap);
+
+TEXTURE2D(_BaseColorMap);
+SAMPLER2D(sampler_BaseColorMap);
+
+TEXTURE2D(_MaskMap);
+SAMPLER2D(sampler_MaskMap);
+TEXTURE2D(_SpecularOcclusionMap);
+SAMPLER2D(sampler_SpecularOcclusionMap);
+
+TEXTURE2D(_NormalMap);
+SAMPLER2D(sampler_NormalMap);
+TEXTURE2D(_NormalMapOS);
+SAMPLER2D(sampler_NormalMapOS);
+
+TEXTURE2D(_DetailMask);
+SAMPLER2D(sampler_DetailMask);
+TEXTURE2D(_DetailMap);
+SAMPLER2D(sampler_DetailMap);
+
+TEXTURE2D(_HeightMap);
+SAMPLER2D(sampler_HeightMap);
+
+TEXTURE2D(_TangentMap);
+SAMPLER2D(sampler_TangentMap);
+TEXTURE2D(_TangentMapOS);
+SAMPLER2D(sampler_TangentMapOS);
+
+TEXTURE2D(_AnisotropyMap);
+SAMPLER2D(sampler_AnisotropyMap);
+
+TEXTURE2D(_SubsurfaceRadiusMap);
+SAMPLER2D(sampler_SubsurfaceRadiusMap);
+TEXTURE2D(_ThicknessMap);
+SAMPLER2D(sampler_ThicknessMap);
+
+TEXTURE2D(_SpecularColorMap);
+SAMPLER2D(sampler_SpecularColorMap);
+
+#else
+
+// Set of users variables
+#define PROP_DECL(type, name) type name##0, name##1, name##2, name##3
+// sampler are share by texture type inside a layered material but we need to support that a particualr layer have no texture, so we take the first sampler of available texture as the share one
+// mean we must declare all sampler
+#define PROP_DECL_TEX2D(name)\
+    TEXTURE2D(MERGE_NAME(name, 0)); \
+    SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 0)); \
+    TEXTURE2D(MERGE_NAME(name, 1)); \
+    SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 1)); \
+    TEXTURE2D(MERGE_NAME(name, 2)); \
+    SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 2)); \
+    TEXTURE2D(MERGE_NAME(name, 3)); \
+    SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 3))
+
+
+PROP_DECL_TEX2D(_BaseColorMap);
+PROP_DECL_TEX2D(_MaskMap);
+PROP_DECL_TEX2D(_SpecularOcclusionMap);
+PROP_DECL_TEX2D(_NormalMap);
+PROP_DECL_TEX2D(_NormalMapOS);
+PROP_DECL_TEX2D(_HeightMap);
+PROP_DECL_TEX2D(_DetailMask);
+PROP_DECL_TEX2D(_DetailMap);
+
+TEXTURE2D(_LayerMaskMap);
+SAMPLER2D(sampler_LayerMaskMap);
+
+#endif
+
 CBUFFER_START(_PerMaterial)
 
 // shared constant between lit and layered lit
 float _PPDMinSamples;
 float _PPDLodThreshold;
 
-TEXTURE2D(_DiffuseLightingMap);
-SAMPLER2D(sampler_DiffuseLightingMap);
-
-TEXTURE2D(_DistortionVectorMap);
-SAMPLER2D(sampler_DistortionVectorMap);
-
-TEXTURE2D(_EmissiveColorMap);
-SAMPLER2D(sampler_EmissiveColorMap);
 float _EmissiveIntensity;
 
 // Caution: C# code in BaseLitUI.cs call LightmapEmissionFlagsProperty() which assume that there is an existing "_EmissionColor"
 
 // Set of users variables
 float4 _BaseColor;
-TEXTURE2D(_BaseColorMap);
-SAMPLER2D(sampler_BaseColorMap);
-TEXTURE2D(_MaskMap);
-SAMPLER2D(sampler_MaskMap);
-TEXTURE2D(_SpecularOcclusionMap);
-SAMPLER2D(sampler_SpecularOcclusionMap);
-
-TEXTURE2D(_NormalMap);
-SAMPLER2D(sampler_NormalMap);
-TEXTURE2D(_NormalMapOS);
-SAMPLER2D(sampler_NormalMapOS);
-TEXTURE2D(_DetailMask);
-SAMPLER2D(sampler_DetailMask);
-TEXTURE2D(_DetailMap);
-SAMPLER2D(sampler_DetailMap);
-TEXTURE2D(_HeightMap);
-SAMPLER2D(sampler_HeightMap);
-TEXTURE2D(_TangentMap);
-SAMPLER2D(sampler_TangentMap);
-TEXTURE2D(_TangentMapOS);
-SAMPLER2D(sampler_TangentMapOS);
-
-TEXTURE2D(_AnisotropyMap);
-SAMPLER2D(sampler_AnisotropyMap);
-TEXTURE2D(_SubsurfaceRadiusMap);
-SAMPLER2D(sampler_SubsurfaceRadiusMap);
-TEXTURE2D(_ThicknessMap);
-SAMPLER2D(sampler_ThicknessMap);
-TEXTURE2D(_SpecularColorMap);
-SAMPLER2D(sampler_SpecularColorMap);
 
 float _TexWorldScale;
 float4 _UVMappingMask;
 
 // Set of users variables
-#define PROP_DECL(type, name) type name##0, name##1, name##2, name##3
-// sampler are share by texture type inside a layered material but we need to support that a particualr layer have no texture, so we take the first sampler of available texture as the share one
-// mean we must declare all sampler
-#define PROP_DECL_TEX2D(name)\
-    TEXTURE2D(MERGE_NAME(name, 0)); \
-    SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 0)); \
-    TEXTURE2D(MERGE_NAME(name, 1)); \
-    SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 1)); \
-    TEXTURE2D(MERGE_NAME(name, 2)); \
-    SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 2)); \
-    TEXTURE2D(MERGE_NAME(name, 3)); \
-    SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 3))
-
-// Set of users variables
-PROP_DECL_TEX2D(_BaseColorMap);
 float4 _BaseColorMap0_ST;
 float4 _BaseColorMap1_ST;
 float4 _BaseColorMap2_ST;
 PROP_DECL(float, _Smoothness);
-PROP_DECL_TEX2D(_MaskMap);
-PROP_DECL_TEX2D(_SpecularOcclusionMap);
-
-PROP_DECL_TEX2D(_NormalMap);
-PROP_DECL_TEX2D(_NormalMapOS);
-PROP_DECL_TEX2D(_HeightMap);
-PROP_DECL_TEX2D(_DetailMask);
-PROP_DECL_TEX2D(_DetailMap);
 float4 _DetailMap0_ST;
 float4 _DetailMap1_ST;
 float4 _DetailMap2_ST;
 
 PROP_DECL(float, _HeightAmplitude);
 PROP_DECL(float, _HeightCenter);
-
-TEXTURE2D(_LayerMaskMap);
-SAMPLER2D(sampler_LayerMaskMap);
 
 float _BlendUsingHeight1;
 float _BlendUsingHeight2;