[Tests] Fix tests for AMD

Author: hyazinthh

src/Tests/Aardvark.Rendering.Tests/Tests/Buffer/Attributes.fs

@@ -324,6 +324,7 @@ module AttributeBuffer =
                 perInstance singleValue interleaved true runtime
 
         let attributeC3bToC4us (perInstance : bool) (singleValue : bool) (interleaved : bool) (runtime : IRuntime) =
+            runtime |> requireVertexFormat Vulkan.VkFormat.B8g8r8Uint
             runtime |> requireExtensionGL [NVGpuShader5]
 
             renderAttribute
@@ -333,6 +334,7 @@ module AttributeBuffer =
                 perInstance singleValue interleaved false runtime
 
         let attributeC3bToC4ui (perInstance : bool) (singleValue : bool) (interleaved : bool) (runtime : IRuntime) =
+            runtime |> requireVertexFormat Vulkan.VkFormat.B8g8r8Uint
             runtime |> requireExtensionGL [NVGpuShader5]
 
             renderAttribute
@@ -342,6 +344,7 @@ module AttributeBuffer =
                 perInstance singleValue interleaved false runtime
 
         let attributeC3bToC4f (perInstance : bool) (singleValue : bool) (interleaved : bool) (runtime : IRuntime) =
+            runtime |> requireVertexFormat Vulkan.VkFormat.B8g8r8Uint
             runtime |> requireExtensionGL [NVGpuShader5]
 
             renderAttribute

src/Tests/Aardvark.Rendering.Tests/Tests/Rendering/Tasks.fs

@@ -100,9 +100,13 @@ module RenderTasks =
             try
                 let _ = output.GetValue(AdaptiveToken.Top, { RenderToken.Empty with Queries = [query] })
                 let samples = query.GetResult()
+                let expectedSamples = uint64 (size.X * size.Y)
+
+                // For Vulkan, AMD seems to count the clear task as well
+                let valid = samples = expectedSamples || samples = expectedSamples * 2UL
 
                 Expect.isGreaterThan samples 0UL "Non-positive sample count"
-                Expect.equal samples (uint64 (size.X * size.Y)) "Unexpected sample count"
+                Expect.isTrue valid $"Expected sample count {expectedSamples} but got {samples}"
             finally
                 output.Release()
 

src/Tests/Aardvark.Rendering.Tests/Tests/Utilities.fs

@@ -622,6 +622,14 @@ module ``Test Utilities`` =
         | :? Vulkan.Runtime as runtime when not <| check runtime.Device.EnabledFeatures -> skiptest message
         | _ -> ()
 
+    let requireVertexFormat (format: Vulkan.VkFormat) (runtime: IRuntime) =
+        match runtime with
+        | :? Vulkan.Runtime as runtime ->
+            let formatFeatures = runtime.Device.PhysicalDevice.GetBufferFormatFeatures format
+            if not <| formatFeatures.HasFlag Vulkan.VkFormatFeatureFlags.VertexBufferBit then
+                skiptest $"Device does not support {format} vertex attributes"
+        | _ -> ()
+
     let requireGL (check: GL.Context -> bool) (message: string) (runtime: IRuntime) =
         match runtime with
         | :? GL.Runtime as runtime ->