HDREnderLoop: Fix various stuff - still don't compile

8 年前 · 05769d33
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/LayeredLit/LayeredLitCommon.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/LayeredLit/LayeredLitCommon.hlsl
    outWeights[0] = left;
 }

-void GetSurfaceAndBuiltinData(float3 V, Varyings input, out SurfaceData surfaceData, out BuiltinData builtinData)
+void GetSurfaceAndBuiltinData(Varyings input, out SurfaceData surfaceData, out BuiltinData builtinData)
 {
    float4 maskValues = float4(1.0, 1.0, 1.0, 1.0);// input.vertexColor;

--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/DefaultLit.shader
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/DefaultLit.shader

            #define SHADERPASS SHADERPASS_DEBUG_VIEW_MATERIAL
            #include "LitCommon.hlsl"
+
+            void GetVaryingsDataDebug(uint paramId, Varyings input, inout float3 result, inout bool needLinearToSRGB)
+            {
+                switch (paramId)
+                {
+                case DEBUGVIEW_VARYING_DEPTH:
+                    // TODO: provide a customize parameter (like a slider)
+                    float linearDepth = frac(LinearEyeDepth(input.positionHS.z, _ZBufferParams) * 0.1);
+                    result = linearDepth.xxx;
+                    break;
+                case DEBUGVIEW_VARYING_TEXCOORD0:
+                    result = float3(input.texCoord0 * 0.5 + 0.5, 0.0);
+                    break;
+                case DEBUGVIEW_VARYING_TEXCOORD1:
+                    result = float3(input.texCoord1 * 0.5 + 0.5, 0.0);
+                    break;
+                case DEBUGVIEW_VARYING_TEXCOORD2:
+                    result = float3(input.texCoord2 * 0.5 + 0.5, 0.0);
+                    break;
+                case DEBUGVIEW_VARYING_VERTEXTANGENTWS:
+                    result = input.tangentToWorld[0].xyz * 0.5 + 0.5;
+                    break;
+                case DEBUGVIEW_VARYING_VERTEXBITANGENTWS:
+                    result = input.tangentToWorld[1].xyz * 0.5 + 0.5;
+                    break;
+                case DEBUGVIEW_VARYING_VERTEXNORMALWS:
+                    result = input.tangentToWorld[2].xyz * 0.5 + 0.5;
+                    break;
+                }
+            }
            
            #include "../../ShaderPass/ShaderPassDebugViewMaterial.hlsl"

--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/LitCommon.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/LitCommon.hlsl
 // Attribute/Varying
 //-------------------------------------------------------------------------------------

-// Forward
 struct Attributes
 {
    float3 positionOS   : POSITION;
-#if SHADERPASS == SHADERPASS_LIGHT_TRANSPORT
+#if (SHADERPASS == SHADERPASS_LIGHT_TRANSPORT) || (SHADERPASS == SHADERPASS_DEBUG_VIEW_MATERIAL)
    float2 uv2		    : TEXCOORD2;
 #endif    
    float4 tangentOS    : TANGENT;  // Always present as we require it also in case of anisotropic lighting
    float3 positionWS;
    float2 texCoord0;
    float2 texCoord1;
-#if SHADERPASS == SHADERPASS_LIGHT_TRANSPORT
+#if (SHADERPASS == SHADERPASS_LIGHT_TRANSPORT) || (SHADERPASS == SHADERPASS_DEBUG_VIEW_MATERIAL)
    float2 texCoord2;
 #endif
    float3 tangentToWorld[3];
 #endif
 };

-void GetVaryingsDataDebug(uint paramId, Varyings input, inout float3 result, inout bool needLinearToSRGB)
-{
-    switch (paramId)
-    {
-    case DEBUGVIEW_VARYING_DEPTH:
-        // TODO: provide a customize parameter (like a slider)
-        float linearDepth = frac(LinearEyeDepth(input.positionHS.z, _ZBufferParams) * 0.1);
-        result = linearDepth.xxx;
-        break;
-    case DEBUGVIEW_VARYING_TEXCOORD0:
-        result = float3(input.texCoord0 * 0.5 + 0.5, 0.0);
-        break;
-    case DEBUGVIEW_VARYING_TEXCOORD1:
-        result = float3(input.texCoord1 * 0.5 + 0.5, 0.0);
-        break;
-#if SHADERPASS == SHADERPASS_LIGHT_TRANSPORT
-    case DEBUGVIEW_VARYING_TEXCOORD2:
-        result = float3(input.texCoord2 * 0.5 + 0.5, 0.0);
-        break;
-#endif
-    case DEBUGVIEW_VARYING_VERTEXTANGENTWS:
-        result = input.tangentToWorld[0].xyz * 0.5 + 0.5;
-        break;
-    case DEBUGVIEW_VARYING_VERTEXBITANGENTWS:
-        result = input.tangentToWorld[1].xyz * 0.5 + 0.5;
-        break;
-    case DEBUGVIEW_VARYING_VERTEXNORMALWS:
-        result = input.tangentToWorld[2].xyz * 0.5 + 0.5;
-        break;
-    }
-}
-
-#if SHADERPASS == SHADERPASS_LIGHT_TANSPORT
+#if (SHADERPASS == SHADERPASS_LIGHT_TRANSPORT) || (SHADERPASS == SHADERPASS_DEBUG_VIEW_MATERIAL)
    float4 interpolators[5] : TEXCOORD0;
 #else
    float4 interpolators[4] : TEXCOORD0;
    output.interpolators[2].w = input.texCoord1.x;
    output.interpolators[3].w = input.texCoord1.y;

-#if SHADERPASS == SHADERPASS_LIGHT_TRANSPORT
+#if (SHADERPASS == SHADERPASS_LIGHT_TRANSPORT) || (SHADERPASS == SHADERPASS_DEBUG_VIEW_MATERIAL)
    output.interpolators[4] = float4(input.texCoord2.xy, 0.0, 0.0);
 #endif

    output.texCoord0.xy = float2(input.interpolators[0].w, input.interpolators[1].w);
    output.texCoord1.xy = float2(input.interpolators[2].w, input.interpolators[3].w);

-#if SHADERPASS == SHADERPASS_LIGHT_TRANSPORT
+#if (SHADERPASS == SHADERPASS_LIGHT_TRANSPORT) || (SHADERPASS == SHADERPASS_DEBUG_VIEW_MATERIAL)
    output.texCoord2 = input.interpolators[4].xy;
 #endif

    output.texCoord0 = input.uv0;
    output.texCoord1 = input.uv1;

-#if SHADERPASS == SHADERPASS_LIGHT_TRANSPORT
+#if (SHADERPASS == SHADERPASS_LIGHT_TRANSPORT) || (SHADERPASS == SHADERPASS_DEBUG_VIEW_MATERIAL)
    output.texCoord2 = input.uv2;
 #endif


 #if SHADER_STAGE_FRAGMENT

-void GetSurfaceAndBuiltinData(float3 V, Varyings input, out SurfaceData surfaceData, out BuiltinData builtinData)
+void GetSurfaceAndBuiltinData(Varyings input, out SurfaceData surfaceData, out BuiltinData builtinData)
+    float3 V = GetWorldSpaceNormalizeViewDir(input.positionWS); // This should be remove by the compiler as we usually cal it before.
    float height = UNITY_SAMPLE_TEX2D(_HeightMap, input.texCoord0).r * _HeightScale + _HeightBias;
    // Transform view vector in tangent space
    TransformWorldToTangent(V, input.tangentToWorld);
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Unlit/UnlitCommon.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Unlit/UnlitCommon.hlsl

 #if SHADER_STAGE_FRAGMENT

-void GetSurfaceAndBuiltinData(float3 V, Varyings input, out SurfaceData surfaceData, out BuiltinData builtinData)
+void GetSurfaceAndBuiltinData(Varyings input, out SurfaceData surfaceData, out BuiltinData builtinData)
 {
    surfaceData.color = UNITY_SAMPLE_TEX2D(_ColorMap, input.texCoord0).rgb * _Color.rgb;
    float alpha = UNITY_SAMPLE_TEX2D(_ColorMap, input.texCoord0).a * _Color.a;
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassDebugViewMaterial.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassDebugViewMaterial.hlsl
 float4 Frag(PackedVaryings packedInput) : SV_Target
 {
 	Varyings input = UnpackVaryings(packedInput);
-    float3 V = GetWorldSpaceNormalizeViewDir(input.positionWS);
+
-	GetSurfaceAndBuiltinData(V, input, surfaceData, builtinData);
+	GetSurfaceAndBuiltinData(input, surfaceData, builtinData);

 	BSDFData bsdfData = ConvertSurfaceDataToBSDFData(surfaceData);

 	return float4(result, 0.0);
 }

-#endif
+#endif
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassForward.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassForward.hlsl

 	SurfaceData surfaceData;
 	BuiltinData builtinData;
-	GetSurfaceAndBuiltinData(V, input, surfaceData, builtinData);
+	GetSurfaceAndBuiltinData(input, surfaceData, builtinData);

 	BSDFData bsdfData = ConvertSurfaceDataToBSDFData(surfaceData);
 	Coordinate coord = GetCoordinate(input.positionHS.xy, _ScreenSize.zw);
 	return float4(diffuseLighting.rgb + specularLighting.rgb, builtinData.opacity);
 }

-#endif
+#endif
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassForwardUnlit.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassForwardUnlit.hlsl
 float4 Frag(PackedVaryings packedInput) : SV_Target
 {
 	Varyings input = UnpackVaryings(packedInput);
-    float3 V = GetWorldSpaceNormalizeViewDir(input.positionWS);
-	GetSurfaceAndBuiltinData(V, input, surfaceData, builtinData);
+	GetSurfaceAndBuiltinData(input, surfaceData, builtinData);
 	
 	// Not lit here (but emissive is allowed)

--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassGBuffer.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassGBuffer.hlsl

 	SurfaceData surfaceData;
 	BuiltinData builtinData;
-	GetSurfaceAndBuiltinData(V, input, surfaceData, builtinData);
+	GetSurfaceAndBuiltinData(input, surfaceData, builtinData);

 	BSDFData bsdfData = ConvertSurfaceDataToBSDFData(surfaceData);
 	Coordinate coord = GetCoordinate(input.positionHS.xy, _ScreenSize.zw);
 	ENCODE_BAKE_LIGHTING_INTO_GBUFFER(GetBakedDiffuseLigthing(preLightData, surfaceData, builtinData, bsdfData), outGBuffer);
 }

-#endif
+#endif
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassLightTransport.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderPass/ShaderPassLightTransport.hlsl
 float4 Frag(PackedVaryings packedInput) : SV_Target
 {
    Varyings input = UnpackVaryings(packedInput);
-    float3 V = float3(0.0, 0.0, 1.0); // Neutral direction as rendering into texture space has no camera information
-    GetSurfaceAndBuiltinData(V, input, surfaceData, builtinData);
+    GetSurfaceAndBuiltinData(input, surfaceData, builtinData);

    BSDFData bsdfData = ConvertSurfaceDataToBSDFData(surfaceData);
    LighTransportData lightTransportData = GetLightTransportData(surfaceData, builtinData, bsdfData);
--- a/Assets/ExperimentalAreaLight.meta
+++ b/Assets/ExperimentalAreaLight.meta
-fileFormatVersion: 2
-guid: e52be75a570c09e4eba76cc51b703050
-folderAsset: yes
-timeCreated: 1463997899
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: