Merge pull request #539 from Unity-Technologies/Branch_FixPVROpacity

Renamed _ColorXXX properties in Unlit to _UnlitColor to avoid conflic…

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs

 
             // Commented out for now because unfortunately we used the hard coded property names used by the GI system for our own parameters
             // So we need a way to work around that before we activate this.
-            //SetupMainTexForAlphaTestGI("_EmissiveColorMap", "_EmissiveColor", material);
+            SetupMainTexForAlphaTestGI("_EmissiveColorMap", "_EmissiveColor", material);
 
             // DoubleSidedGI has to be synced with our double sided toggle
             var serializedObject = new SerializedObject(material);

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/UnlitUI.cs

         }
 
         protected MaterialProperty color = null;
-        protected const string kColor = "_Color";
+        protected const string kColor = "_UnlitColor";
-        protected const string kColorMap = "_ColorMap";
+        protected const string kColorMap = "_UnlitColorMap";
         protected MaterialProperty emissiveColor = null;
         protected const string kEmissiveColor = "_EmissiveColor";
         protected MaterialProperty emissiveColorMap = null;

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Unlit.shader

 {
     Properties
     {
-        _Color("Color", Color) = (1,1,1,1)
-        _ColorMap("ColorMap", 2D) = "white" {}
+        // Be careful, do not change the name here to _Color. It will conflict with the "fake" parameters (see end of properties) required for GI.
+        _UnlitColor("Color", Color) = (1,1,1,1)
+        _UnlitColorMap("ColorMap", 2D) = "white" {}
 
         _EmissiveColor("EmissiveColor", Color) = (0, 0, 0)
         _EmissiveColorMap("EmissiveColorMap", 2D) = "white" {}

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/UnlitData.hlsl

 
 void GetSurfaceAndBuiltinData(FragInputs input, float3 V, inout PositionInputs posInput, out SurfaceData surfaceData, out BuiltinData builtinData)
 {
-    surfaceData.color = SAMPLE_TEXTURE2D(_ColorMap, sampler_ColorMap, input.texCoord0).rgb * _Color.rgb;
-    float alpha = SAMPLE_TEXTURE2D(_ColorMap, sampler_ColorMap, input.texCoord0).a * _Color.a;
+    surfaceData.color = SAMPLE_TEXTURE2D(_UnlitColorMap, sampler_UnlitColorMap, input.texCoord0).rgb * _UnlitColor.rgb;
+    float alpha = SAMPLE_TEXTURE2D(_UnlitColorMap, sampler_UnlitColorMap, input.texCoord0).a * _UnlitColor.a;
 
 #ifdef _ALPHATEST_ON
     DoAlphaTest(alpha, _AlphaCutoff);

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/UnlitProperties.hlsl

-float4  _Color;
-TEXTURE2D(_ColorMap);
-SAMPLER2D(sampler_ColorMap);
+float4  _UnlitColor;
+TEXTURE2D(_UnlitColorMap);
+SAMPLER2D(sampler_UnlitColorMap);
 
 TEXTURE2D(_DistortionVectorMap);
 SAMPLER2D(sampler_DistortionVectorMap);