metal/ios: lower samplecount for mobile compute limitations, disable MIS since there is no read_write texture support

Antti Tapaninen · Antti Tapaninen · commit a0e21be09fbc · 2017-04-05T15:52:23.000-07:00
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/Resources/ComputeGgxIblSampleData.compute b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/Resources/ComputeGgxIblSampleData.compute
@@ -3,7 +3,11 @@
 #include "../../../ShaderLibrary/Common.hlsl"
 #include "../../../ShaderLibrary/ImageBasedLighting.hlsl"
 
+#ifdef SHADER_API_MOBILE
+#define MAX_IBL_SAMPLE_CNT 34
+#else
 #define MAX_IBL_SAMPLE_CNT 89
+#endif
 
 RWTexture2D<float4> output; // [MAX_SAMPLE_CNT x UNITY_SPECCUBE_LOD_STEPS]
 
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/RuntimeFilterIBL.cs b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/RuntimeFilterIBL.cs
@@ -7,7 +7,7 @@ namespace UnityEngine.Experimental.Rendering.HDPipeline
     public class IBLFilterGGX
     {
         RenderTexture m_GgxIblSampleData              = null;
-        const int     k_GgxIblMaxSampleCount          = 89;   // Width
+        int           k_GgxIblMaxSampleCount          = TextureCache.isMobileBuildTarget ? 34 : 89;   // Width
         const int     k_GgxIblMipCountMinusOne        = 6;    // Height (UNITY_SPECCUBE_LOD_STEPS)
 
         ComputeShader m_ComputeGgxIblSampleDataCS     = null;
@@ -19,11 +19,18 @@ public class IBLFilterGGX
 
         Material      m_GgxConvolveMaterial           = null; // Convolves a cubemap with GGX
 
+        bool          m_SupportMIS = !TextureCache.isMobileBuildTarget;
+
         public bool IsInitialized()
         {
             return m_GgxIblSampleData != null;
         }
 
+        public bool SupportMIS
+        {
+            get { return m_SupportMIS; }
+        }
+
         public void Initialize(ScriptableRenderContext context)
         {
             if (!m_ComputeGgxIblSampleDataCS)
@@ -32,7 +39,7 @@ public void Initialize(ScriptableRenderContext context)
                 m_ComputeGgxIblSampleDataKernel = m_ComputeGgxIblSampleDataCS.FindKernel("ComputeGgxIblSampleData");
             }
 
-            if (!m_BuildProbabilityTablesCS)
+            if (!m_BuildProbabilityTablesCS && SupportMIS)
             {
                 m_BuildProbabilityTablesCS   = Resources.Load<ComputeShader>("BuildProbabilityTables");
                 m_ConditionalDensitiesKernel = m_BuildProbabilityTablesCS.FindKernel("ComputeConditionalDensities");
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
@@ -358,7 +358,7 @@ private void RenderCubemapGGXConvolution(ScriptableRenderContext renderContext,
                 renderContext.ExecuteCommandBuffer(cmd);
                 cmd.Dispose();
 
-                if (m_useMIS)
+                if (m_useMIS && m_iblFilterGgx.SupportMIS)
                 {
                     m_iblFilterGgx.FilterCubemapMIS(renderContext, input, target, mipCount, m_SkyboxConditionalCdfRT, m_SkyboxMarginalRowCdfRT, m_CubemapFaceMesh);
                 }
diff --git a/Assets/ScriptableRenderPipeline/ShaderLibrary/ImageBasedLighting.hlsl b/Assets/ScriptableRenderPipeline/ShaderLibrary/ImageBasedLighting.hlsl
@@ -306,10 +306,17 @@ uint GetIBLRuntimeFilterSampleCount(uint mipLevel)
     {
         case 1: sampleCount = 21; break;
         case 2: sampleCount = 34; break;
+#ifdef SHADER_API_MOBILE
+        case 3: sampleCount = 34; break;
+        case 4: sampleCount = 34; break;
+        case 5: sampleCount = 34; break;
+        case 6: sampleCount = 34; break; // UNITY_SPECCUBE_LOD_STEPS
+#else
         case 3: sampleCount = 55; break;
         case 4: sampleCount = 89; break;
         case 5: sampleCount = 89; break;
         case 6: sampleCount = 89; break; // UNITY_SPECCUBE_LOD_STEPS
+#endif
     }
 
     return sampleCount;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace UnityEngine.Experimental.Rendering.HDPipeline`
`7`	`7`	`public class IBLFilterGGX`
`8`	`8`	`{`
`9`	`9`	`RenderTexture m_GgxIblSampleData = null;`
`10`		`- const int k_GgxIblMaxSampleCount = 89; // Width`
	`10`	`+ int k_GgxIblMaxSampleCount = TextureCache.isMobileBuildTarget ? 34 : 89; // Width`
`11`	`11`	`const int k_GgxIblMipCountMinusOne = 6; // Height (UNITY_SPECCUBE_LOD_STEPS)`
`12`	`12`
`13`	`13`	`ComputeShader m_ComputeGgxIblSampleDataCS = null;`
`@@ -19,11 +19,18 @@ public class IBLFilterGGX`
`19`	`19`
`20`	`20`	`Material m_GgxConvolveMaterial = null; // Convolves a cubemap with GGX`
`21`	`21`
	`22`	`+ bool m_SupportMIS = !TextureCache.isMobileBuildTarget;`
	`23`	`+`
`22`	`24`	`public bool IsInitialized()`
`23`	`25`	`{`
`24`	`26`	`return m_GgxIblSampleData != null;`
`25`	`27`	`}`
`26`	`28`
	`29`	`+ public bool SupportMIS`
	`30`	`+ {`
	`31`	`+ get { return m_SupportMIS; }`
	`32`	`+ }`
	`33`	`+`
`27`	`34`	`public void Initialize(ScriptableRenderContext context)`
`28`	`35`	`{`
`29`	`36`	`if (!m_ComputeGgxIblSampleDataCS)`
`@@ -32,7 +39,7 @@ public void Initialize(ScriptableRenderContext context)`
`32`	`39`	`m_ComputeGgxIblSampleDataKernel = m_ComputeGgxIblSampleDataCS.FindKernel("ComputeGgxIblSampleData");`
`33`	`40`	`}`
`34`	`41`
`35`		`- if (!m_BuildProbabilityTablesCS)`
	`42`	`+ if (!m_BuildProbabilityTablesCS && SupportMIS)`
`36`	`43`	`{`
`37`	`44`	`m_BuildProbabilityTablesCS = Resources.Load<ComputeShader>("BuildProbabilityTables");`
`38`	`45`	`m_ConditionalDensitiesKernel = m_BuildProbabilityTablesCS.FindKernel("ComputeConditionalDensities");`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ private void RenderCubemapGGXConvolution(ScriptableRenderContext renderContext,`
`358`	`358`	`renderContext.ExecuteCommandBuffer(cmd);`
`359`	`359`	`cmd.Dispose();`
`360`	`360`
`361`		`- if (m_useMIS)`
	`361`	`+ if (m_useMIS && m_iblFilterGgx.SupportMIS)`
`362`	`362`	`{`
`363`	`363`	`m_iblFilterGgx.FilterCubemapMIS(renderContext, input, target, mipCount, m_SkyboxConditionalCdfRT, m_SkyboxMarginalRowCdfRT, m_CubemapFaceMesh);`
`364`	`364`	`}`