HDRenderPipeline: Update Metapass to do correct ifdef test

7 年前 · bc549388
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
            #define SHADERPASS SHADERPASS_LIGHT_TRANSPORT
            #include "../../ShaderVariables.hlsl"
            #include "../../Material/Material.hlsl"
-            #include "../Lit/ShaderPass/LitMetaPass.hlsl"
+            #include "../Lit/ShaderPass/LitSharePass.hlsl"
            #include "LayeredLitData.hlsl"
            #include "../../ShaderPass/ShaderPassLightTransport.hlsl"

--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader
            #define SHADERPASS SHADERPASS_LIGHT_TRANSPORT
            #include "../../ShaderVariables.hlsl"
            #include "../../Material/Material.hlsl"
-            #include "../Lit/ShaderPass/LitMetaPass.hlsl"
+            #include "../Lit/ShaderPass/LitSharePass.hlsl"
            #include "LayeredLitData.hlsl"
            #include "../../ShaderPass/ShaderPassLightTransport.hlsl"

--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
            #define SHADERPASS SHADERPASS_LIGHT_TRANSPORT
            #include "../../ShaderVariables.hlsl"
            #include "../../Material/Material.hlsl"
-            #include "ShaderPass/LitMetaPass.hlsl"
+            #include "ShaderPass/LitSharePass.hlsl"
            #include "LitData.hlsl"
            #include "../../ShaderPass/ShaderPassLightTransport.hlsl"

--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitTessellation.shader
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitTessellation.shader
            #define SHADERPASS SHADERPASS_LIGHT_TRANSPORT
            #include "../../ShaderVariables.hlsl"
            #include "../../Material/Material.hlsl"
-            #include "ShaderPass/LitMetaPass.hlsl"
+            #include "ShaderPass/LitSharePass.hlsl"
            #include "LitData.hlsl"
            #include "../../ShaderPass/ShaderPassLightTransport.hlsl"

--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/ShaderPass/LitSharePass.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/ShaderPass/LitSharePass.hlsl
 #define ATTRIBUTES_NEED_TEXCOORD1
 #define ATTRIBUTES_NEED_COLOR

-#if defined(_REQUIRE_UV2) || defined(_REQUIRE_UV3) || defined(DYNAMICLIGHTMAP_ON) || defined(DEBUG_DISPLAY)
+#if defined(_REQUIRE_UV2) || defined(_REQUIRE_UV3) || defined(DYNAMICLIGHTMAP_ON) || defined(DEBUG_DISPLAY) || (SHADERPASS == SHADERPASS_LIGHT_TRANSPORT)
 #define ATTRIBUTES_NEED_TEXCOORD2
 #endif
 #if defined(_REQUIRE_UV3) || defined(DEBUG_DISPLAY)
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
        // Since we don't have those parameters in our shaders we need to provide a "fake" useless version of them with the right values for the GI to work.
        protected static void SetupMainTexForAlphaTestGI(string colorMapPropertyName, string colorPropertyName, Material material)
        {
-            if(material.HasProperty(colorMapPropertyName))
+            if (material.HasProperty(colorMapPropertyName))
-            if(material.HasProperty(colorPropertyName))
+            if (material.HasProperty(colorPropertyName))
-            if(material.HasProperty("_AlphaCutoff")) // Same for all our materials
+            if (material.HasProperty("_AlphaCutoff")) // Same for all our materials
            {
                var cutoff = material.GetFloat("_AlphaCutoff");
                material.SetFloat("_Cutoff", cutoff);
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/ShaderPass/UnlitSharePass.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/ShaderPass/UnlitSharePass.hlsl

 #define ATTRIBUTES_NEED_TEXCOORD0

+#if defined(DEBUG_DISPLAY) || (SHADERPASS == SHADERPASS_LIGHT_TRANSPORT)
+// For the meta pass with emissive we require UV1 and/or UV2
+#define ATTRIBUTES_NEED_TEXCOORD1
+#define ATTRIBUTES_NEED_TEXCOORD2
+#endif
+
 #if defined(_ENABLE_FOG_ON_TRANSPARENT)
 #define VARYINGS_NEED_POSITION_WS
 #endif
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Unlit.shader
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Unlit.shader

            #define SHADERPASS SHADERPASS_LIGHT_TRANSPORT
            #include "../../Material/Material.hlsl"
-            #include "ShaderPass/UnlitMetaPass.hlsl"
+            #include "ShaderPass/UnlitSharePass.hlsl"
            #include "UnlitData.hlsl"
            #include "../../ShaderPass/ShaderPassLightTransport.hlsl"

--- a/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassLightTransport.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassLightTransport.hlsl
    // OpenGL right now needs to actually use the incoming vertex position
    // so we create a fake dependency on it here that haven't any impact.
    output.vmesh.positionCS = float4(uv * 2.0 - 1.0, inputMesh.positionOS.z > 0 ? 1.0e-4 : 0.0, 1.0);
-    output.vmesh.texCoord0  = inputMesh.uv0;
-    output.vmesh.texCoord1  = inputMesh.uv1;
-    output.vmesh.texCoord2  = inputMesh.uv2;
-    output.vmesh.texCoord3  = inputMesh.uv3;
+#ifdef VARYINGS_NEED_POSITION_WS
+#endif
-#if defined(VARYINGS_NEED_COLOR)
+#ifdef VARYINGS_NEED_TEXCOORD0
+    output.vmesh.texCoord0 = inputMesh.uv0;
+#endif
+#ifdef VARYINGS_NEED_TEXCOORD1
+    output.vmesh.texCoord1 = inputMesh.uv1;
+#endif
+#ifdef VARYINGS_NEED_TEXCOORD2
+    output.vmesh.texCoord2 = inputMesh.uv2;
+#endif
+#ifdef VARYINGS_NEED_TEXCOORD3
+    output.vmesh.texCoord3 = inputMesh.uv3;
+#endif
+#ifdef VARYINGS_NEED_COLOR
    output.vmesh.color = inputMesh.color;
 #endif

--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/ShaderPass/LitMetaPass.hlsl.meta
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/ShaderPass/LitMetaPass.hlsl.meta
-fileFormatVersion: 2
-guid: a55741149134f0a4280500a1842a7460
-timeCreated: 1478601047
-licenseType: Pro
-ShaderImporter:
-  defaultTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/ShaderPass/LitMetaPass.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/ShaderPass/LitMetaPass.hlsl
-#ifndef SHADERPASS
-#error Undefine_SHADERPASS
-#endif
-
-#define ATTRIBUTES_NEED_TEXCOORD0
-#define ATTRIBUTES_NEED_TEXCOORD1
-#define ATTRIBUTES_NEED_TEXCOORD2
-#define ATTRIBUTES_NEED_TEXCOORD3
-
-#ifdef _VERTEX_WIND
-#define ATTRIBUTES_NEED_COLOR
-#define ATTRIBUTES_NEED_NORMAL
-#endif
-
-#define REQUIRE_VERTEX_COLOR defined(LAYERED_LIT_SHADER) && (defined(_LAYER_MASK_VERTEX_COLOR_MUL) || defined(_LAYER_MASK_VERTEX_COLOR_ADD))
-
-#if REQUIRE_VERTEX_COLOR
-#define ATTRIBUTES_NEED_COLOR
-#endif
-
-#define VARYINGS_NEED_TEXCOORD0
-#define VARYINGS_NEED_TEXCOORD1
-#define VARYINGS_NEED_TEXCOORD2
-#define VARYINGS_NEED_TEXCOORD3
-
-#define VARYINGS_NEED_POSITION_WS
-
-#if REQUIRE_VERTEX_COLOR
-#define VARYINGS_NEED_COLOR
-#endif
-
-// This include will define the various Attributes/Varyings structure
-#include "../../ShaderPass/VaryingMesh.hlsl"
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/ShaderPass/UnlitMetaPass.hlsl.meta
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/ShaderPass/UnlitMetaPass.hlsl.meta
-fileFormatVersion: 2
-guid: 34b6e92ecac8a054085e28dc783b1a80
-timeCreated: 1484323639
-licenseType: Pro
-ShaderImporter:
-  defaultTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/ShaderPass/UnlitMetaPass.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/ShaderPass/UnlitMetaPass.hlsl
-#ifndef SHADERPASS
-#error Undefine_SHADERPASS
-#endif
-
-#define ATTRIBUTES_NEED_TEXCOORD0
-#define ATTRIBUTES_NEED_TEXCOORD1
-#define ATTRIBUTES_NEED_TEXCOORD2
-#define ATTRIBUTES_NEED_TEXCOORD3
-
-#define VARYINGS_NEED_TEXCOORD0
-#define VARYINGS_NEED_TEXCOORD1
-#define VARYINGS_NEED_TEXCOORD2
-#define VARYINGS_NEED_TEXCOORD3
-
-#define VARYINGS_NEED_POSITION_WS
-
-// This include will define the various Attributes/Varyings structure
-#include "../../ShaderPass/VaryingMesh.hlsl"