[Vulkan] Remove deprecated EXTDebugReport

aardvark-platform · Apr 25, 2024 · ce3a26b · ce3a26b
1 parent 5217787
commit ce3a26b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/src/Aardvark.Rendering.Vulkan/Core/DebugReport.fs b/src/Aardvark.Rendering.Vulkan/Core/DebugReport.fs
@@ -12,7 +12,6 @@ open System.Threading
 open System.Collections.Concurrent
 open Aardvark.Base
 open Microsoft.FSharp.NativeInterop
-open EXTDebugReport
 open EXTDebugUtils
 
 type MessageSeverity =
@@ -80,16 +79,6 @@ module private DebugReportHelpers =
             ]
 
 
-    [<AutoOpen>]
-    module EnumExtensions =
-        type VkDebugReportFlagsEXT with
-            static member All =
-                VkDebugReportFlagsEXT.DebugBit |||
-                VkDebugReportFlagsEXT.ErrorBit |||
-                VkDebugReportFlagsEXT.InformationBit |||
-                VkDebugReportFlagsEXT.PerformanceWarningBit |||
-                VkDebugReportFlagsEXT.WarningBit
-
     type VkDebugUtilsMessengerCallbackEXTDelegate =
         delegate of VkDebugUtilsMessageSeverityFlagsEXT * VkDebugUtilsMessageTypeFlagsEXT * nativeptr<VkDebugUtilsMessengerCallbackDataEXT> * nativeint -> int
 

diff --git a/src/Aardvark.Rendering.Vulkan/Core/Platform.fs b/src/Aardvark.Rendering.Vulkan/Core/Platform.fs
@@ -40,10 +40,7 @@ module Instance =
 
         let ConservativeRasterization       = EXTConservativeRasterization.Name
 
-        let Debug = [
-            EXTDebugReport.Name
-            EXTDebugUtils.Name
-        ]
+        let Debug                           = EXTDebugUtils.Name
 
         let Raytracing = [
                 KHRRayTracingPipeline.Name
@@ -156,9 +153,9 @@ type Instance(apiVersion : Version, layers : list<string>, extensions : list<str
 
     let extensions =
         if debug.DebugReportEnabled || debug.ValidationLayerEnabled then
-            extensions @ Instance.Extensions.Debug
+            extensions @ [Instance.Extensions.Debug]
         else
-            extensions |> List.filter (fun e -> Instance.Extensions.Debug |> List.contains e |> not)
+            extensions |> List.filter ((<>) Instance.Extensions.Debug)
         |> List.distinct
 
     let layers =
@@ -170,9 +167,7 @@ type Instance(apiVersion : Version, layers : list<string>, extensions : list<str
     let layers, instanceExtensions = filterLayersAndExtensions layers extensions
 
     let debugReportEnabled =
-        Instance.Extensions.Debug |> List.forall (fun e ->
-            instanceExtensions |> List.contains e
-        )
+        instanceExtensions |> List.contains Instance.Extensions.Debug
 
     let validationEnabled =
         layers |> List.contains Instance.Layers.Validation