Fix code where FormatUsage enums are used as flags (#4972)

hkr · web-flow · commit 883bd1c2bb6f · 2021-09-21T09:22:18.000+02:00
Co-authored-by: Florian Penzkofer &lt;florian@unity3d.com&gt;
diff --git a/com.unity.postprocessing/PostProcessing/Runtime/Effects/AmbientOcclusion.cs b/com.unity.postprocessing/PostProcessing/Runtime/Effects/AmbientOcclusion.cs
@@ -190,9 +190,9 @@ public override bool IsEnabledAndSupported(PostProcessRenderContext context)
 
                 state &= SystemInfo.supportsComputeShaders
                     && !RuntimeUtilities.isAndroidOpenGL
-                    && SystemInfo.IsFormatSupported(GraphicsFormat.R32_SFloat, FormatUsage.Render | FormatUsage.Sparse)
-                    && SystemInfo.IsFormatSupported(GraphicsFormat.R16_SFloat, FormatUsage.Render | FormatUsage.Sparse)
-                    && SystemInfo.IsFormatSupported(GraphicsFormat.R8_UNorm, FormatUsage.Render | FormatUsage.Sparse);
+                    && SystemInfo.IsFormatSupported(GraphicsFormat.R32_SFloat, FormatUsage.Sparse) // Sparse implies Render
+                    && SystemInfo.IsFormatSupported(GraphicsFormat.R16_SFloat, FormatUsage.Sparse)
+                    && SystemInfo.IsFormatSupported(GraphicsFormat.R8_UNorm, FormatUsage.Sparse);
             }
 
             return state;
diff --git a/com.unity.render-pipelines.core/Runtime/Utilities/TextureCurve.cs b/com.unity.render-pipelines.core/Runtime/Utilities/TextureCurve.cs
@@ -111,9 +111,9 @@ public void SetDirty()
 
         static GraphicsFormat GetTextureFormat()
         {
-            if (SystemInfo.IsFormatSupported(GraphicsFormat.R16_SFloat, FormatUsage.Sample | FormatUsage.SetPixels))
+            if (SystemInfo.IsFormatSupported(GraphicsFormat.R16_SFloat, FormatUsage.Sample) && SystemInfo.IsFormatSupported(GraphicsFormat.R16_SFloat, FormatUsage.SetPixels))
                 return GraphicsFormat.R16_SFloat;
-            if (SystemInfo.IsFormatSupported(GraphicsFormat.R8_UNorm, FormatUsage.Sample | FormatUsage.SetPixels))
+            if (SystemInfo.IsFormatSupported(GraphicsFormat.R8_UNorm, FormatUsage.Sample) && SystemInfo.IsFormatSupported(GraphicsFormat.R8_UNorm, FormatUsage.SetPixels))
                 return GraphicsFormat.R8_UNorm;
 
             return GraphicsFormat.R8G8B8A8_UNorm;
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/RendererLighting.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/RendererLighting.cs
@@ -68,9 +68,9 @@ private static GraphicsFormat GetRenderTextureFormat()
         {
             if (!s_HasSetupRenderTextureFormatToUse)
             {
-                if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear | FormatUsage.Render))
+                if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear) && SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Render))
                     s_RenderTextureFormatToUse = GraphicsFormat.B10G11R11_UFloatPack32;
-                else if (SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear | FormatUsage.Render))
+                else if (SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear) && SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Render))
                     s_RenderTextureFormatToUse = GraphicsFormat.R16G16B16A16_SFloat;
 
                 s_HasSetupRenderTextureFormatToUse = true;
diff --git a/com.unity.render-pipelines.universal/Runtime/NativeRenderPass.cs b/com.unity.render-pipelines.universal/Runtime/NativeRenderPass.cs
@@ -670,10 +670,10 @@ private static GraphicsFormat GetDefaultGraphicsFormat(CameraData cameraData)
 
                 if (!Graphics.preserveFramebufferAlpha &&
                     RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.B10G11R11_UFloatPack32,
-                        FormatUsage.Linear | FormatUsage.Render))
+                        FormatUsage.Linear, FormatUsage.Render))
                     hdrFormat = GraphicsFormat.B10G11R11_UFloatPack32;
                 else if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R16G16B16A16_SFloat,
-                    FormatUsage.Linear | FormatUsage.Render))
+                    FormatUsage.Linear, FormatUsage.Render))
                     hdrFormat = GraphicsFormat.R16G16B16A16_SFloat;
                 else
                     hdrFormat = SystemInfo.GetGraphicsFormat(DefaultFormat.HDR);
diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/ColorGradingLutPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/ColorGradingLutPass.cs
@@ -39,10 +39,9 @@ Material Load(Shader shader)
             m_LutBuilderHdr = Load(data.shaders.lutBuilderHdrPS);
 
             // Warm up lut format as IsFormatSupported adds GC pressure...
-            const FormatUsage kFlags = FormatUsage.Linear | FormatUsage.Render;
-            if (SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, kFlags))
+            if (SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear) && SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Render))
                 m_HdrLutFormat = GraphicsFormat.R16G16B16A16_SFloat;
-            else if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, kFlags))
+            else if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear) && SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Render))
                 m_HdrLutFormat = GraphicsFormat.B10G11R11_UFloatPack32;
             else
                 // Obviously using this for log lut encoding is a very bad idea for precision but we
diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs
@@ -97,7 +97,8 @@ public PostProcessPass(RenderPassEvent evt, PostProcessData data, Material blitM
             m_BlitMaterial = blitMaterial;
 
             // Texture format pre-lookup
-            if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear | FormatUsage.Render))
+            if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear) &&
+                SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Render))
             {
                 m_DefaultHDRFormat = GraphicsFormat.B10G11R11_UFloatPack32;
                 m_UseRGBM = false;
@@ -116,9 +117,9 @@ public PostProcessPass(RenderPassEvent evt, PostProcessData data, Material blitM
             else
                 m_SMAAEdgeFormat = GraphicsFormat.R8G8B8A8_UNorm;
 
-            if (SystemInfo.IsFormatSupported(GraphicsFormat.R16_UNorm, FormatUsage.Linear | FormatUsage.Render))
+            if (SystemInfo.IsFormatSupported(GraphicsFormat.R16_UNorm, FormatUsage.Linear) && SystemInfo.IsFormatSupported(GraphicsFormat.R16_UNorm, FormatUsage.Render))
                 m_GaussianCoCFormat = GraphicsFormat.R16_UNorm;
-            else if (SystemInfo.IsFormatSupported(GraphicsFormat.R16_SFloat, FormatUsage.Linear | FormatUsage.Render))
+            else if (SystemInfo.IsFormatSupported(GraphicsFormat.R16_SFloat, FormatUsage.Linear) && SystemInfo.IsFormatSupported(GraphicsFormat.R16_SFloat, FormatUsage.Render))
                 m_GaussianCoCFormat = GraphicsFormat.R16_SFloat;
             else // Expect CoC banding
                 m_GaussianCoCFormat = GraphicsFormat.R8_UNorm;
diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/ScreenSpaceShadowResolvePass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/ScreenSpaceShadowResolvePass.cs
@@ -26,7 +26,7 @@ public void Setup(RenderTextureDescriptor baseDescriptor)
             m_RenderTextureDescriptor = baseDescriptor;
             m_RenderTextureDescriptor.depthBufferBits = 0;
             m_RenderTextureDescriptor.msaaSamples = 1;
-            m_RenderTextureDescriptor.graphicsFormat = RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R8_UNorm, FormatUsage.Linear | FormatUsage.Render)
+            m_RenderTextureDescriptor.graphicsFormat = RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R8_UNorm, FormatUsage.Linear, FormatUsage.Render)
                 ? GraphicsFormat.R8_UNorm
                 : GraphicsFormat.B8G8R8A8_UNorm;
         }
diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs
@@ -128,7 +128,7 @@ public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderin
                 m_RenderTextureDescriptor = renderingData.cameraData.cameraTargetDescriptor;
                 m_RenderTextureDescriptor.depthBufferBits = 0;
                 m_RenderTextureDescriptor.msaaSamples = 1;
-                m_RenderTextureDescriptor.graphicsFormat = RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R8_UNorm, FormatUsage.Linear | FormatUsage.Render)
+                m_RenderTextureDescriptor.graphicsFormat = RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R8_UNorm, FormatUsage.Linear, FormatUsage.Render)
                     ? GraphicsFormat.R8_UNorm
                     : GraphicsFormat.B8G8R8A8_UNorm;
 
diff --git a/com.unity.render-pipelines.universal/Runtime/RenderingUtils.cs b/com.unity.render-pipelines.universal/Runtime/RenderingUtils.cs
@@ -314,6 +314,19 @@ public static bool SupportsGraphicsFormat(GraphicsFormat format, FormatUsage usa
             return support;
         }
 
+        /// <summary>
+        /// Checks if a texture format is supported by the run-time system.
+        /// Similar to <see cref="SystemInfo.IsFormatSupported"/>, but doesn't allocate memory.
+        /// </summary>
+        /// <param name="format">The format to look up.</param>
+        /// <param name="usage1">The first format usage to look up.</param>
+        /// <param name="usage2">The second format usage to look up.</param>
+        /// <returns>Returns true if the graphics card supports the given <c>GraphicsFormat</c> and both usage1 and usage 2.</returns>
+        public static bool SupportsGraphicsFormat(GraphicsFormat format, FormatUsage usage1, FormatUsage usage2)
+        {
+            return SupportsGraphicsFormat(format, usage1) && SupportsGraphicsFormat(format, usage2);
+        }
+
         /// <summary>
         /// Return the last colorBuffer index actually referring to an existing RenderTarget
         /// </summary>
diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs
@@ -513,9 +513,9 @@ static GraphicsFormat MakeRenderTextureGraphicsFormat(bool isHdrEnabled, bool ne
         {
             if (isHdrEnabled)
             {
-                if (!needsAlpha && RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear | FormatUsage.Render))
+                if (!needsAlpha && RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear, FormatUsage.Render))
                     return GraphicsFormat.B10G11R11_UFloatPack32;
-                if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear | FormatUsage.Render))
+                if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear, FormatUsage.Render))
                     return GraphicsFormat.R16G16B16A16_SFloat;
                 return SystemInfo.GetGraphicsFormat(DefaultFormat.HDR); // This might actually be a LDR format on old devices.
             }

Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,9 @@ private static GraphicsFormat GetRenderTextureFormat()`
`68`	`68`	`{`
`69`	`69`	`if (!s_HasSetupRenderTextureFormatToUse)`
`70`	`70`	`{`
`71`		`- if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear \| FormatUsage.Render))`
	`71`	`+ if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear) && SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Render))`
`72`	`72`	`s_RenderTextureFormatToUse = GraphicsFormat.B10G11R11_UFloatPack32;`
`73`		`- else if (SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear \| FormatUsage.Render))`
	`73`	`+ else if (SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear) && SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Render))`
`74`	`74`	`s_RenderTextureFormatToUse = GraphicsFormat.R16G16B16A16_SFloat;`
`75`	`75`
`76`	`76`	`s_HasSetupRenderTextureFormatToUse = true;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void Setup(RenderTextureDescriptor baseDescriptor)`
`26`	`26`	`m_RenderTextureDescriptor = baseDescriptor;`
`27`	`27`	`m_RenderTextureDescriptor.depthBufferBits = 0;`
`28`	`28`	`m_RenderTextureDescriptor.msaaSamples = 1;`
`29`		`- m_RenderTextureDescriptor.graphicsFormat = RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R8_UNorm, FormatUsage.Linear \| FormatUsage.Render)`
	`29`	`+ m_RenderTextureDescriptor.graphicsFormat = RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R8_UNorm, FormatUsage.Linear, FormatUsage.Render)`
`30`	`30`	`? GraphicsFormat.R8_UNorm`
`31`	`31`	`: GraphicsFormat.B8G8R8A8_UNorm;`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -513,9 +513,9 @@ static GraphicsFormat MakeRenderTextureGraphicsFormat(bool isHdrEnabled, bool ne`
`513`	`513`	`{`
`514`	`514`	`if (isHdrEnabled)`
`515`	`515`	`{`
`516`		`- if (!needsAlpha && RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear \| FormatUsage.Render))`
	`516`	`+ if (!needsAlpha && RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear, FormatUsage.Render))`
`517`	`517`	`return GraphicsFormat.B10G11R11_UFloatPack32;`
`518`		`- if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear \| FormatUsage.Render))`
	`518`	`+ if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear, FormatUsage.Render))`
`519`	`519`	`return GraphicsFormat.R16G16B16A16_SFloat;`
`520`	`520`	`return SystemInfo.GetGraphicsFormat(DefaultFormat.HDR); // This might actually be a LDR format on old devices.`
`521`	`521`	`}`