Fix two more shader warnings (caused by early outs, which the HLSL compiler hates). These likely crept in with the 10.7.0 upgrade. (#31)

pastasfuture · pastasfuture · commit 24e4916a8628 · 2022-10-13T12:35:21.000-07:00
Co-authored-by: pastasfuture &lt;nickb@bonfirestudios.com&gt;
diff --git a/com.unity.render-pipelines.core/ShaderLibrary/Debug.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/Debug.hlsl
@@ -99,34 +99,42 @@ float4 GetStreamingMipColor(uint mipCount, float4 mipInfo)
     // w = 0
     uint originalTextureMipCount = uint(mipInfo.y);
 
+    float4 res = 0.0;
+
     // If material/shader mip info (original mip level) has not been set its not a streamed texture
     if (originalTextureMipCount == 0)
-        return float4(1.0, 1.0, 1.0, 0.0);
-
-    uint desiredMipLevel = uint(mipInfo.z);
-    uint mipCountDesired = uint(originalTextureMipCount)-uint(desiredMipLevel);
-    if (mipCount == 0)
-    {
-        // Magenta if mip count invalid
-        return float4(1.0, 0.0, 1.0, 1.0);
-    }
-    else if (mipCount < mipCountDesired)
     {
-        // red tones when not at the desired mip level (reduction due to budget). Brighter is further from original, alpha 0 when at desired
-        float ratioToDesired = float(mipCount) / float(mipCountDesired);
-        return float4(1.0, 0.0, 0.0, 1.0 - ratioToDesired);
-    }
-    else if (mipCount >= originalTextureMipCount)
-    {
-        // original color when at (or beyond) original mip count
-        return float4(1.0, 1.0, 1.0, 0.0);
+        res = float4(1.0, 1.0, 1.0, 0.0);
     }
     else
     {
-        // green tones when not at the original mip level. Brighter is closer to original, alpha 0 when at original
-        float ratioToOriginal = float(mipCount) / float(originalTextureMipCount);
-        return float4(0.0, 1.0, 0.0, 1.0 - ratioToOriginal);
+        uint desiredMipLevel = uint(mipInfo.z);
+        uint mipCountDesired = uint(originalTextureMipCount)-uint(desiredMipLevel);
+        if (mipCount == 0)
+        {
+            // Magenta if mip count invalid
+            res = float4(1.0, 0.0, 1.0, 1.0);
+        }
+        else if (mipCount < mipCountDesired)
+        {
+            // red tones when not at the desired mip level (reduction due to budget). Brighter is further from original, alpha 0 when at desired
+            float ratioToDesired = float(mipCount) / float(mipCountDesired);
+            res = float4(1.0, 0.0, 0.0, 1.0 - ratioToDesired);
+        }
+        else if (mipCount >= originalTextureMipCount)
+        {
+            // original color when at (or beyond) original mip count
+            res = float4(1.0, 1.0, 1.0, 0.0);
+        }
+        else
+        {
+            // green tones when not at the original mip level. Brighter is closer to original, alpha 0 when at original
+            float ratioToOriginal = float(mipCount) / float(originalTextureMipCount);
+            res = float4(0.0, 1.0, 0.0, 1.0 - ratioToOriginal);
+        }
     }
+
+    return res;
 }
 
 float4 GetSimpleMipCountColor(uint mipCount)
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScattering.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScattering.hlsl
@@ -233,19 +233,20 @@ void FillMaterialTransmission(uint diffusionProfileIndex, float thickness, inout
 
 uint FindDiffusionProfileIndex(uint diffusionProfileHash)
 {
-    if (diffusionProfileHash == 0)
-        return 0;
-
     uint diffusionProfileIndex = 0;
-    uint i = 0;
 
-    // Fetch the 4 bit index number by looking for the diffusion profile unique ID:
-    for (i = 0; i < _DiffusionProfileCount; i++)
+    if (diffusionProfileHash != 0)
     {
-        if (_DiffusionProfileHashTable[i].x == diffusionProfileHash)
+        uint i = 0;
+
+        // Fetch the 4 bit index number by looking for the diffusion profile unique ID:
+        for (i = 0; i < _DiffusionProfileCount; i++)
         {
-            diffusionProfileIndex = i;
-            break;
+            if (_DiffusionProfileHashTable[i].x == diffusionProfileHash)
+            {
+                diffusionProfileIndex = i;
+                break;
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -233,19 +233,20 @@ void FillMaterialTransmission(uint diffusionProfileIndex, float thickness, inout`
`233`	`233`
`234`	`234`	`uint FindDiffusionProfileIndex(uint diffusionProfileHash)`
`235`	`235`	`{`
`236`		`- if (diffusionProfileHash == 0)`
`237`		`- return 0;`
`238`		`-`
`239`	`236`	`uint diffusionProfileIndex = 0;`
`240`		`- uint i = 0;`
`241`	`237`
`242`		`- // Fetch the 4 bit index number by looking for the diffusion profile unique ID:`
`243`		`- for (i = 0; i < _DiffusionProfileCount; i++)`
	`238`	`+ if (diffusionProfileHash != 0)`
`244`	`239`	`{`
`245`		`- if (_DiffusionProfileHashTable[i].x == diffusionProfileHash)`
	`240`	`+ uint i = 0;`
	`241`	`+`
	`242`	`+ // Fetch the 4 bit index number by looking for the diffusion profile unique ID:`
	`243`	`+ for (i = 0; i < _DiffusionProfileCount; i++)`
`246`	`244`	`{`
`247`		`- diffusionProfileIndex = i;`
`248`		`- break;`
	`245`	`+ if (_DiffusionProfileHashTable[i].x == diffusionProfileHash)`
	`246`	`+ {`
	`247`	`+ diffusionProfileIndex = i;`
	`248`	`+ break;`
	`249`	`+ }`
`249`	`250`	`}`
`250`	`251`	`}`
`251`	`252`