Code Cleanup;

Runtime/HDRP/Shaders/Includes/Properties/UtsHdrpProperties.hlsl

@@ -0,0 +1,358 @@
+// ===========================================================================
+//                              WARNING:
+// On PS4, texture/sampler declarations need to be outside of CBuffers
+// Otherwise those parameters are not bound correctly at runtime.
+// ===========================================================================
+
+#define fixed  half
+
+#define UNITY_TEXTURE_STREAMING_DEBUG_VARS
+float4 unity_MipmapStreaming_DebugTex_ST;
+float4 unity_MipmapStreaming_DebugTex_TexelSize;
+float4 unity_MipmapStreaming_DebugTex_MipInfo;
+float4 unity_MipmapStreaming_DebugTex_StreamInfo;
+
+// Unity Toon Shader
+#include "UtsTextures.hlsl"
+
+// Lit
+TEXTURE2D(_DistortionVectorMap);
+SAMPLER(sampler_DistortionVectorMap);
+
+TEXTURE2D(_EmissiveColorMap);
+SAMPLER(sampler_EmissiveColorMap);
+
+#ifndef LAYERED_LIT_SHADER
+
+TEXTURE2D(_DiffuseLightingMap);
+SAMPLER(sampler_DiffuseLightingMap);
+
+TEXTURE2D(_BaseColorMap);
+SAMPLER(sampler_BaseColorMap);
+
+TEXTURE2D(_HairBlendingMap);
+SAMPLER(sampler_HairBlendingMap);
+
+TEXTURE2D(_MaskMap);
+SAMPLER(sampler_MaskMap);
+TEXTURE2D(_BentNormalMap); // Reuse sampler from normal map
+SAMPLER(sampler_BentNormalMap);
+
+TEXTURE2D(_NormalMap);
+SAMPLER(sampler_NormalMap);
+TEXTURE2D(_NormalMapOS);
+SAMPLER(sampler_NormalMapOS);
+
+TEXTURE2D(_DetailMap);
+SAMPLER(sampler_DetailMap);
+
+TEXTURE2D(_HeightMap);
+SAMPLER(sampler_HeightMap);
+
+TEXTURE2D(_TangentMap);
+SAMPLER(sampler_TangentMap);
+TEXTURE2D(_TangentMapOS);
+SAMPLER(sampler_TangentMapOS);
+
+TEXTURE2D(_AnisotropyMap);
+SAMPLER(sampler_AnisotropyMap);
+
+TEXTURE2D(_SubsurfaceMaskMap);
+SAMPLER(sampler_SubsurfaceMaskMap);
+TEXTURE2D(_ThicknessMap);
+SAMPLER(sampler_ThicknessMap);
+
+TEXTURE2D(_IridescenceThicknessMap);
+SAMPLER(sampler_IridescenceThicknessMap);
+
+TEXTURE2D(_IridescenceMaskMap);
+SAMPLER(sampler_IridescenceMaskMap);
+
+TEXTURE2D(_SpecularColorMap);
+SAMPLER(sampler_SpecularColorMap);
+
+TEXTURE2D(_TransmittanceColorMap);
+SAMPLER(sampler_TransmittanceColorMap);
+
+TEXTURE2D(_CoatMaskMap);
+SAMPLER(sampler_CoatMaskMap);
+
+TEXTURE2D(_SSSLutMap);
+//SAMPLER(sampler_SSSLutMap); //Use s_linear_clamp_sampler instead
+
+TEXTURE2D(_SDFShadowTex);
+SAMPLER(sampler_SDFShadowTex);
+
+TEXTURE2D(_HairShadowTex);
+TEXTURE2D(_HairBlendingTex);
+
+#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(CALL_MERGE_NAME(name, 0)); \
+    SAMPLER(CALL_MERGE_NAME(CALL_MERGE_NAME(sampler, name), 0)); \
+    TEXTURE2D(CALL_MERGE_NAME(name, 1)); \
+    SAMPLER(CALL_MERGE_NAME(CALL_MERGE_NAME(sampler, name), 1)); \
+    TEXTURE2D(CALL_MERGE_NAME(name, 2)); \
+    SAMPLER(CALL_MERGE_NAME(CALL_MERGE_NAME(sampler, name), 2)); \
+    TEXTURE2D(CALL_MERGE_NAME(name, 3)); \
+    SAMPLER(CALL_MERGE_NAME(CALL_MERGE_NAME(sampler, name), 3))
+
+
+PROP_DECL_TEX2D(_BaseColorMap);
+PROP_DECL_TEX2D(_MaskMap);
+PROP_DECL_TEX2D(_BentNormalMap);
+PROP_DECL_TEX2D(_NormalMap);
+PROP_DECL_TEX2D(_NormalMapOS);
+PROP_DECL_TEX2D(_DetailMap);
+PROP_DECL_TEX2D(_HeightMap);
+
+PROP_DECL_TEX2D(_SubsurfaceMaskMap);
+PROP_DECL_TEX2D(_ThicknessMap);
+
+TEXTURE2D(_LayerMaskMap);
+SAMPLER(sampler_LayerMaskMap);
+TEXTURE2D(_LayerInfluenceMaskMap);
+SAMPLER(sampler_LayerInfluenceMaskMap);
+
+#endif
+
+CBUFFER_START(UnityPerMaterial)
+
+#include "UtsUnityPerMaterial.hlsl"
+
+// shared constant between lit and layered lit
+float _AlphaCutoff;
+float _UseShadowThreshold;
+float _AlphaCutoffShadow;
+float _AlphaCutoffPrepass;
+float _AlphaCutoffPostpass;
+float4 _DoubleSidedConstants;
+float _DistortionScale;
+float _DistortionVectorScale;
+float _DistortionVectorBias;
+float _DistortionBlurScale;
+float _DistortionBlurRemapMin;
+float _DistortionBlurRemapMax;
+
+float _PPDMaxSamples;
+float _PPDMinSamples;
+float _PPDLodThreshold;
+
+float3 _EmissiveColor;
+float _AlbedoAffectEmissive;
+float _EmissiveExposureWeight;
+
+int  _SpecularOcclusionMode;
+
+// Transparency
+float3 _TransmittanceColor;
+float _Ior;
+float _ATDistance;
+
+// Caution: C# code in BaseLitUI.cs call LightmapEmissionFlagsProperty() which assume that there is an existing "_EmissionColor"
+// value that exist to identify if the GI emission need to be enabled.
+// In our case we don't use such a mechanism but need to keep the code quiet. We declare the value and always enable it.
+// TODO: Fix the code in legacy unity so we can customize the beahvior for GI
+float3 _EmissionColor;
+float4 _EmissiveColorMap_ST;
+float _TexWorldScaleEmissive;
+float4 _UVMappingMaskEmissive;
+
+float _ID_Intensity;
+float _IR_Intensity;
+
+float4 _InvPrimScale; // Only XY are used
+
+// Wind
+float _InitialBend;
+float _Stiffness;
+float _Drag;
+float _ShiverDrag;
+float _ShiverDirectionality;
+
+// Specular AA
+float _EnableGeometricSpecularAA;
+float _SpecularAAScreenSpaceVariance;
+float _SpecularAAThreshold;
+
+#ifndef LAYERED_LIT_SHADER
+
+// Set of users variables
+float4 _BaseColor;
+float4 _BaseColorMap_ST;
+float4 _BaseColorMap_TexelSize;
+float4 _BaseColorMap_MipInfo;
+
+float _Metallic;
+float _MetallicRemapMin;
+float _MetallicRemapMax;
+float _Smoothness;
+float _SmoothnessRemapMin;
+float _SmoothnessRemapMax;
+float _Roughness;
+float _RoughnessRemapMin;
+float _RoughnessRemapMax;
+float _AlphaRemapMin;
+float _AlphaRemapMax;
+float _AORemapMin;
+float _AORemapMax;
+float _SSSIntensity;
+int _Use_SSSLut;
+
+float4 _SpecularColor;
+float _ToonSpecularStep;
+float _ToonSpecularFeather;
+
+float _ReceivesSSR;
+float _ReceivesSSAO;
+float _AO_Factor;
+float _ReceivesSSGI;
+float _GIMultiplier;
+
+float _NormalScale;
+
+float4 _DetailMap_ST;
+float _DetailAlbedoScale;
+float _DetailNormalScale;
+float _DetailSmoothnessScale;
+
+float4 _HeightMap_TexelSize; // Unity facility. This will provide the size of the heightmap to the shader
+
+float _HeightAmplitude;
+float _HeightCenter;
+
+float _Anisotropy;
+float4 _AnisotropyMap_ST;
+int _Use_Anisotropy;
+float4 _KKColor;
+float _BSDFContribution;
+
+float _DiffusionProfileHash;
+float _SubsurfaceMask;
+float _TransmissionMask;
+float _Thickness;
+float4 _ThicknessRemap;
+
+
+float _IridescenceThickness;
+float4 _IridescenceThicknessRemap;
+float _IridescenceMask;
+
+float _CoatMask;
+
+//float4 _SpecularColor;
+float _EnergyConservingSpecularColor;
+
+float _TexWorldScale;
+float _InvTilingScale;
+float4 _UVMappingMask;
+float4 _UVDetailsMappingMask;
+float _LinkDetailsWithBase;
+float _ObjectSpaceUVMapping;
+#else // LAYERED_LIT_SHADER
+
+// Set of users variables
+PROP_DECL(float4, _BaseColor);
+float4 _BaseColorMap0_ST;
+float4 _BaseColorMap1_ST;
+float4 _BaseColorMap2_ST;
+float4 _BaseColorMap3_ST;
+
+float4 _BaseColorMap0_TexelSize;
+float4 _BaseColorMap0_MipInfo;
+
+PROP_DECL(float, _Metallic);
+PROP_DECL(float, _MetallicRemapMin);
+PROP_DECL(float, _MetallicRemapMax);
+PROP_DECL(float, _Smoothness);
+PROP_DECL(float, _SmoothnessRemapMin);
+PROP_DECL(float, _SmoothnessRemapMax);
+PROP_DECL(float, _AORemapMin);
+PROP_DECL(float, _AORemapMax);
+
+PROP_DECL(float, _NormalScale);
+float4 _NormalMap0_TexelSize; // Unity facility. This will provide the size of the base normal to the shader
+
+float4 _HeightMap0_TexelSize;
+float4 _HeightMap1_TexelSize;
+float4 _HeightMap2_TexelSize;
+float4 _HeightMap3_TexelSize;
+
+float4 _DetailMap0_ST;
+float4 _DetailMap1_ST;
+float4 _DetailMap2_ST;
+float4 _DetailMap3_ST;
+PROP_DECL(float, _UVDetail);
+PROP_DECL(float, _DetailAlbedoScale);
+PROP_DECL(float, _DetailNormalScale);
+PROP_DECL(float, _DetailSmoothnessScale);
+
+PROP_DECL(float, _HeightAmplitude);
+PROP_DECL(float, _HeightCenter);
+
+PROP_DECL(float, _DiffusionProfileHash);
+PROP_DECL(float, _SubsurfaceMask);
+PROP_DECL(float, _Thickness);
+PROP_DECL(float4, _ThicknessRemap);
+
+PROP_DECL(float, _OpacityAsDensity);
+float _InheritBaseNormal1;
+float _InheritBaseNormal2;
+float _InheritBaseNormal3;
+float _InheritBaseHeight1;
+float _InheritBaseHeight2;
+float _InheritBaseHeight3;
+float _InheritBaseColor1;
+float _InheritBaseColor2;
+float _InheritBaseColor3;
+PROP_DECL(float, _HeightOffset);
+float _HeightTransition;
+
+float4 _LayerMaskMap_ST;
+float _TexWorldScaleBlendMask;
+PROP_DECL(float, _TexWorldScale);
+PROP_DECL(float, _InvTilingScale);
+float4 _UVMappingMaskBlendMask;
+PROP_DECL(float4, _UVMappingMask);
+PROP_DECL(float4, _UVDetailsMappingMask);
+PROP_DECL(float, _LinkDetailsWithBase);
+
+#endif // LAYERED_LIT_SHADER
+
+
+
+// Tessellation specific
+
+#ifdef TESSELLATION_ON
+float _TessellationFactor;
+float _TessellationFactorMinDistance;
+float _TessellationFactorMaxDistance;
+float _TessellationFactorTriangleSize;
+float _TessellationShapeFactor;
+float _TessellationBackFaceCullEpsilon;
+float _TessellationObjectScale;
+float _TessellationTilingScale;
+#endif
+
+// Following two variables are feeded by the C++ Editor for Scene selection
+int _ObjectId;
+int _PassValue;
+
+CBUFFER_END
+
+float _Outline_MaxWidth;
+
+float4 _HairShadowRTHandleScale;
+
+float _HairShadowDistance;
+float _HairShadowDistanceScaleFactor;
+float _HairShadowDepthBias;
+float _HairShadowFadeInDistance;
+float _HairShadowFadeOutDistance;
+
+float4 _HairBlendingRTHandleScale;

Runtime/HDRP/Shaders/Includes/Properties/UtsHdrpProperties.hlsl.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: f766a049b2bd4cd4bac4693fe41e62b2
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/HDRP/Shaders/Includes/Properties/UtsTextures.hlsl

@@ -0,0 +1,21 @@
+TEXTURE2D(_MainTex); SAMPLER(sampler_MainTex);
+TEXTURE2D(_1st_ShadeMap);
+TEXTURE2D(_2nd_ShadeMap);
+
+TEXTURE2D(_MatCapMap);
+
+sampler _Set_1st_ShadePosition;
+sampler _Set_2nd_ShadePosition;
+sampler _ShadingGradeMap;
+sampler _HighColor_Tex;
+sampler _Set_HighColorMask;
+sampler _Set_RimLightMask;
+sampler _NormalMapForMatCap;
+sampler _Set_MatcapMask;
+sampler _Emissive_Tex;
+// sampler2D _ClippingMask;
+TEXTURE2D(_ClippingMask);
+sampler _AngelRing_Sampler;
+sampler _Outline_Sampler;
+sampler _OutlineTex;
+sampler _BakedNormal;

Runtime/HDRP/Shaders/Includes/Properties/UtsTextures.hlsl.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5b757fd47d2cd7d4e8b2e32ece1f6f8d
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/HDRP/Shaders/Includes/Properties/UtsUnityPerMaterial.hlsl

@@ -0,0 +1,205 @@
+
+// cosntant in Unity Toon Shader
+float _utsTechnique;
+float4 _Color;
+fixed _Use_BaseAs1st;
+fixed _Use_1stAs2nd;
+fixed _Is_LightColor_Base;
+float4 _MainTex_ST;
+float4 _1st_ShadeMap_ST;
+float4 _1st_ShadeColor;
+fixed _Is_LightColor_1st_Shade;
+float4 _2nd_ShadeMap_ST;
+float4 _2nd_ShadeColor;
+fixed _Is_LightColor_2nd_Shade;
+fixed _Is_NormalMapToBase;
+fixed _Set_SystemShadowsToBase;
+
+float _Tweak_SystemShadowsLevel;
+float _ShadowBias;
+float _SDFShadowLevel;
+float _SDFSmoothGamma;
+float _SDFNoseHighlightCoef;
+float _SDFNoseHighlightSmoothRange;
+
+float _EyeParallaxAmount;
+float _HairBlendingFactor;
+
+float _BaseColor_Step;
+float _BaseShade_Feather;
+float4 _Set_1st_ShadePosition_ST;
+
+float _ShadeColor_Step;
+float _1st2nd_Shades_Feather;
+float4 _Set_2nd_ShadePosition_ST;
+float4 _ShadingGradeMap_ST;
+
+float _Tweak_ShadingGradeMapLevel;
+fixed _BlurLevelSGM;
+//
+float _1st_ShadeColor_Step;
+float _1st_ShadeColor_Feather;
+float _2nd_ShadeColor_Step;
+float _2nd_ShadeColor_Feather;
+
+float4 _HighColor;
+float4 _HighColor_Tex_ST;
+fixed _Is_LightColor_HighColor;
+
+fixed _Is_NormalMapToHighColor;
+float _HighColor_Power;
+fixed _Is_SpecularToHighColor;
+fixed _Is_BlendAddToHiColor;
+fixed _Is_BlendAddToRimColor;
+fixed _Is_UseTweakHighColorOnShadow;
+float _TweakHighColorOnShadow;
+float4 _Set_HighColorMask_ST;
+float _Tweak_HighColorMaskLevel;
+fixed _RimLight;
+float4 _RimLightColor;
+float _RimLight_Strength;
+fixed _Is_LightColor_RimLight;
+fixed _Is_NormalMapToRimLight;
+float _RimLight_Power;
+float _RimLight_InsideMask;
+fixed _RimLight_FeatherOff;
+fixed _LightDirection_MaskOn;
+float _Tweak_LightDirection_MaskLevel;
+fixed _Add_Antipodean_RimLight;
+float4 _Ap_RimLightColor;
+fixed _Is_LightColor_Ap_RimLight;
+float _Ap_RimLight_Power;
+fixed _Ap_RimLight_FeatherOff;
+float4 _Set_RimLightMask_ST;
+float _Tweak_RimLightMaskLevel;
+fixed _MatCap;
+float4 _MatCap_Sampler_ST;
+float4 _MatCapColor;
+fixed _Is_LightColor_MatCap;
+fixed _Is_BlendAddToMatCap;
+float _Tweak_MatCapUV;
+float _Rotate_MatCapUV;
+fixed _Is_NormalMapForMatCap;
+float4 _NormalMapForMatCap_ST;
+float _Rotate_NormalMapForMatCapUV;
+fixed _Is_UseTweakMatCapOnShadow;
+float _TweakMatCapOnShadow;
+float4 _Set_MatcapMask_ST;
+float _Tweak_MatcapMaskLevel;
+fixed _Is_Ortho;
+float _CameraRolling_Stabilizer;
+fixed _BlurLevelMatcap;
+fixed _Inverse_MatcapMask;
+float _BumpScale;
+float _BumpScaleMatcap;
+float4 _Emissive_Tex_ST;
+float4 _Emissive_Color;
+
+fixed _Is_ViewCoord_Scroll;
+float _Rotate_EmissiveUV;
+float _Base_Speed;
+float _Scroll_EmissiveU;
+float _Scroll_EmissiveV;
+fixed _Is_PingPong_Base;
+float4 _ColorShift;
+float4 _ViewShift;
+float _ColorShift_Speed;
+fixed _Is_ColorShift;
+fixed _Is_ViewShift;
+float3 emissive;
+// 
+float _Unlit_Intensity;
+
+fixed _Is_Filter_HiCutPointLightColor;
+fixed _Is_Filter_LightColor;
+
+float _StepOffset;
+fixed _Is_BLD;
+float _Offset_X_Axis_BLD;
+float _Offset_Y_Axis_BLD;
+fixed _Inverse_Z_Axis_BLD;
+
+float4 _ClippingMask_ST;
+
+fixed _IsBaseMapAlphaAsClippingMask;
+float _Clipping_Level;
+fixed _Inverse_Clipping;
+float _Tweak_transparency;
+fixed _AngelRing;
+float4 _AngelRing_Sampler_ST;
+
+float  _BaseColorVisible;
+float  _BaseColorOverridden;
+float4 _BaseColorMaskColor;
+
+float  _FirstShadeVisible;
+float  _FirstShadeOverridden;
+float4 _FirstShadeMaskColor;
+
+float  _SecondShadeVisible;
+float  _SecondShadeOverridden;
+float4 _SecondShadeMaskColor;
+
+float  _HighlightVisible;
+float  _HighlightOverridden;
+float4 _HighlightMaskColor;
+
+float  _AngelRingVisible;
+float  _AngelRingOverridden;
+float4 _AngelRingMaskColor;
+
+float  _RimLightVisible;
+float  _RimLightOverridden;
+float4 _RimLightMaskColor;
+
+float _OutlineVisible;
+float _OutlineOverridden;
+float4 _OutlineMaskColor;
+
+float _ComposerMaskMode;
+int _ClippingMatteMode;
+
+float _GI_Intensity;
+float _Light_Intensity_Multiplier;
+
+
+float4 _AngelRing_Color;
+fixed _Is_LightColor_AR;
+float _AR_Intensity;
+float _AR_ShadowIntensity;
+float _AR_OffsetU;
+float _AR_OffsetV;
+fixed _ARSampler_AlphaOn;
+
+// Unity Toon Shader Outline
+
+float _Outline_Width;
+float _Farthest_Distance;
+float _Nearest_Distance;
+float4 _Outline_Sampler_ST;
+float4 _Outline_Color;
+fixed _Is_BlendBaseColor;
+float _Offset_Z;
+float4 _OutlineTex_ST;
+fixed _Is_OutlineTex;
+float4 _BakedNormal_ST;
+fixed _Is_BakedNormal;
+fixed _UseSmoothedNormal;
+
+float _ZOverDrawMode;
+ //
+
+#if defined(_UTS_TOON_EV_PER_MODEL)
+// not in materials
+int _ToonLightHiCutFilter;
+int _ToonEvAdjustmentCurve;
+float _ToonEvAdjustmentValueArray[128];
+float _ToonEvAdjustmentValueMin;
+float _ToonEvAdjustmentValueMax;
+float _ToonEvAdjustmentCompensation;
+#endif //#if !defined(_UTS_TOON_EV_PER_MODEL)
+
+
+float _BlendMode;
+
+float3 _ObjectCenterPositionWS;

Runtime/HDRP/Shaders/Includes/Properties/UtsUnityPerMaterial.hlsl.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 7efa59ca140c8c1448f8198e85ed27ec
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: