[Vulkan] Make ILogger and Logger internal

Author: hyazinthh

src/Aardvark.Rendering.Vulkan/Core/Common/Features.fs

@@ -53,7 +53,7 @@ type MemoryFeatures =
         BufferDeviceAddressMultiDevice: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "robust buffer access:   %A" x.RobustBufferAccess
         l.line "sparse binding:         %A" x.SparseBinding
         l.line "sparse buffers:         %A" x.SparseResidencyBuffer
@@ -108,7 +108,7 @@ type DescriptorFeatures =
         RuntimeDescriptorArray: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.section "update after bind: " (fun () ->
             l.line "uniform buffers:         %A" x.BindingUniformBufferUpdateAfterBind
             l.line "sampled images:          %A" x.BindingSampledImageUpdateAfterBind
@@ -140,7 +140,7 @@ type ImageFeatures =
         CompressionBC: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "cube arrays:              %A" x.ImageCubeArray
         l.line "ETC2 compression:         %A" x.CompressionETC2
         l.line "ASTC LDR compression:     %A" x.CompressionASTC_LDR
@@ -155,7 +155,7 @@ type SamplerFeatures =
         YcbcrConversion: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "anisotropy:           %A" x.Anisotropy
         l.line "ycbcr:                %A" x.YcbcrConversion
 
@@ -278,7 +278,7 @@ type ShaderFeatures =
         DrawParameters: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "geometry:                          %A" x.GeometryShader
         l.line "tesselation:                       %A" x.TessellationShader
         l.line "geometry / tesselation point size: %A" x.TessellationAndGeometryPointSize
@@ -342,7 +342,7 @@ type QueryFeatures =
         InheritedQueries: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "precise occlusion:   %A" x.OcclusionQueryPrecise
         l.line "pipeline statistics: %A" x.PipelineStatistics
         l.line "inherited queries:   %A" x.InheritedQueries
@@ -359,7 +359,7 @@ type DepthFeatures =
         BoundsTest: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "clamping:      %A" x.Clamp
         l.line "bias clamping: %A" x.BiasClamp
         l.line "bounds test:   %A" x.BoundsTest
@@ -376,7 +376,7 @@ type BlendFeatures =
         LogicOp: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "per-attachment:   %A" x.IndependentBlend
         l.line "dual-source:      %A" x.DualSrcBlend
         l.line "logic operations: %A" x.LogicOp
@@ -393,7 +393,7 @@ type DrawingFeatures =
         DrawIndirectFirstInstance: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "full 32-bit indices:          %A" x.FullDrawIndexUint32
         l.line "multi draw indirect:          %A" x.MultiDrawIndirect
         l.line "draw indirect first instance: %A" x.DrawIndirectFirstInstance
@@ -404,7 +404,7 @@ type MultiviewFeatures =
         MultiViewport: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "multiple viewports:             %A" x.MultiViewport
 
 type RasterizerFeatures =
@@ -430,7 +430,7 @@ type RasterizerFeatures =
         VariableMultisampleRate: bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "wide lines:                %A" x.WideLines
         l.line "large points:              %A" x.LargePoints
         l.line "non-solid fill mode:       %A" x.FillModeNonSolid
@@ -447,7 +447,7 @@ type GraphicsPipelineFeatures =
         Rasterizer: RasterizerFeatures
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.section "depth:" (fun () -> x.Depth.Print(l))
         l.section "blending:" (fun () -> x.Blending.Print(l))
         l.section "drawing:" (fun () -> x.Drawing.Print(l))
@@ -487,7 +487,7 @@ type RaytracingFeatures =
         AccelerationStructureHostCommands : bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "pipeline:                           %A" x.Pipeline
         l.line "ray queries:                        %A" x.RayQuery
         l.section "shader group handles: " (fun () ->
@@ -519,7 +519,7 @@ type DeviceFeatures =
         Raytracing : RaytracingFeatures
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.section "memory:" (fun () -> x.Memory.Print(l))
         l.section "descriptors:" (fun () -> x.Descriptors.Print(l))
         l.section "images:" (fun () -> x.Images.Print(l))

src/Aardvark.Rendering.Vulkan/Core/Common/Limits.fs

@@ -22,7 +22,7 @@ type ImageLimits =
         MaxArrayLayers : int
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max 1D size:   %d" x.MaxDimension1D
         l.line "max 2D size:   %A" x.MaxDimension2D
         l.line "max 3D size:   %A" x.MaxDimension3D
@@ -47,7 +47,7 @@ type SampledImageLimits =
         StorageSampleCounts : Set<int>
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "color samples:      %A" (Set.toList x.ColorSampleCounts)
         l.line "integer samples:    %A" (Set.toList x.IntegerSampleCounts)
         l.line "depth samples:      %A" (Set.toList x.DepthSampleCounts)
@@ -66,7 +66,7 @@ type SamplerLimits =
         MaxAnisotropy : float
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max allocations: %A" x.MaxAllocationCount
         l.line "max lod bias:    %A" x.MaxLodBias
         l.line "max anisotropy:  %A" x.MaxAnisotropy
@@ -86,7 +86,7 @@ type UniformLimits =
         MaxPushConstantsSize : Mem
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max buffer range:   %A" x.MaxBufferViewRange
         l.line "max storage range:  %A" x.MaxStorageViewRange
         l.line "max texel elements: %A" x.MaxTexelBufferElements
@@ -128,7 +128,7 @@ type MemoryLimits =
 
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max allocations:            %d" x.MaxAllocationCount
         l.line "max allocation size:        %A" x.MaxAllocationSize
         l.line "sparse size:                %A" x.SparseAddressSpaceSize
@@ -193,7 +193,7 @@ type DescriptorLimits =
 
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max bound sets:          %d" x.MaxBoundDescriptorSets
         l.line "max samplers:            %d" x.MaxSamplers
         l.line "max uniform buffers:     %d" x.MaxUniformBuffers
@@ -231,7 +231,7 @@ type VertexLimits =
         MaxOutputComponents : int
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max in attributes:  %d" x.MaxInputAttributes
         l.line "max in bindings:    %d" x.MaxInputBindings
         l.line "max in offset:      %d" x.MaxInputAttributeOffset
@@ -252,7 +252,7 @@ type TessControlLimits =
         /// the maximum total number of components of per-vertex and per-patch output variables which can be output from the tessellation control shader stage.
         MaxTotalOutputComponents : int
     }
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max vertex in components:  %d" x.MaxPerVertexInputComponents
         l.line "max vertex out components: %d" x.MaxPerVertexOutputComponents
         l.line "max patch out components:  %d" x.MaxPerPatchOutputComponents
@@ -266,7 +266,7 @@ type TessEvalLimits =
         /// the maximum number of components of per-vertex output variables which can be output from the tessellation evaluation shader stage.
         MaxOutputComponents : int
     }
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max in components:  %d" x.MaxInputComponents
         l.line "max out components: %d" x.MaxOutputComponents
 
@@ -282,7 +282,7 @@ type TessellationLimits =
         TessEvalLimits : TessEvalLimits
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max gen level:  %d" x.MaxGenerationLevel
         l.line "max patch size: %d" x.MaxPatchSize
         l.section "control:" (fun () ->
@@ -309,7 +309,7 @@ type GeometryLimits =
         /// the maximum total number of components of output, across all emitted vertices, which can be output from the geometry shader stage.
         MaxTotalOutputComponents : int
     }
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max invocations:    %d" x.MaxInvocations
         l.line "max out vertices:   %d" x.MaxOutputVertices
         l.line "max in components:  %d" x.MaxInputComponents
@@ -335,7 +335,7 @@ type FragmentLimits =
         /// the maximum number of array elements of a variable decorated with the SampleMask built-in decoration.
         MaxSampleMaskWords : int
     }
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max in components:     %d" x.MaxInputComponents
         l.line "max out attachments:   %d" x.MaxOutputAttachments
         l.line "max src1 attachments:  %d" x.MaxDualSrcAttachments
@@ -356,7 +356,7 @@ type ComputeLimits =
         /// the maximum size of a local compute workgroup, per dimension. These three values represent the maximum local workgroup size in the X, Y, and Z dimensions, respectively.
         MaxWorkGroupSize : V3i
     }
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "shared memory:         %A" x.MaxSharedMemorySize
         l.line "max group counts:      %A" x.MaxWorkGroupCount
         l.line "max group invocations: %d" x.MaxWorkGroupInvocations
@@ -395,7 +395,7 @@ type ShaderLimits =
         MaxCombinedClipAndCullDistances : int
 
     }
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max clip distances:      %d" x.MaxClipDistances
         l.line "max cull distances:      %d" x.MaxCullDistances
         l.line "max clip/cull distances: %d" x.MaxCombinedClipAndCullDistances
@@ -425,7 +425,7 @@ type PrecisionLimits =
         DiscreteQueuePriorities : int
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "subpixel bits:    %d" x.SubPixelPrecisionBits
         l.line "subtexel bits:    %d" x.SubTexelPrecisionBits
         l.line "mipmap bits:      %d" x.MipMapPrecisionBits
@@ -442,7 +442,7 @@ type DrawLimits =
         MaxIndirectCount    : uint32
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max index value:    %d" x.MaxIndexValue
         l.line "max indirect count: %d" x.MaxIndirectCount
 
@@ -485,7 +485,7 @@ type FramebufferLimits =
 
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max size:   %A" x.MaxSize
         l.line "max layers: %d" x.MaxLayers
         l.line "max colors: %d" x.MaxColorAttachments
@@ -523,7 +523,7 @@ type RasterizerLimits =
         StandardSampleLocations : bool
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "point size:       [%f .. %f .. %f]" x.PointSizeRange.Min x.PointSizeGranularity x.PointSizeRange.Max
         l.line "line width:       [%f .. %f .. %f]" x.LineWidthRange.Min x.LineWidthGranularity x.LineWidthRange.Max
         l.line "strict lines:     %A" x.StrictLines
@@ -587,7 +587,7 @@ type RaytracingLimits =
         MaxRayHitAttributeSize                                      : uint32
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.line "max ray recursion depth:      %d" x.MaxRayRecursionDepth
         l.line "max ray dispatch invocations: %d" x.MaxRayDispatchInvocationCount
         l.line "max ray hit attribute size:   %d" x.MaxRayHitAttributeSize
@@ -632,7 +632,7 @@ type DeviceLimits =
         Raytracing      : RaytracingLimits option
     }
 
-    member x.Print(l : ILogger) =
+    member internal x.Print(l : ILogger) =
         l.section "image:" (fun () -> x.Image.Print(l))
         l.section "sampled image:" (fun () -> x.SampledImage.Print(l))
         l.section "sampler:" (fun () -> x.Sampler.Print(l))

src/Aardvark.Rendering.Vulkan/Core/Device/Device.fs

@@ -326,8 +326,8 @@ type Device private (physicalDevice: PhysicalDevice, wantedExtensions: list<stri
     member x.PhysicalDeviceGroup = physicalDevice :?> PhysicalDeviceGroup
     member x.IsDeviceGroup = isGroup
 
-    member x.PrintMemoryUsage(logger: ILogger) =
-        memoryAllocator.PrintUsage logger
+    member x.PrintMemoryUsage([<Optional; DefaultParameterValue(2)>] verbosity: int) =
+        memoryAllocator.PrintUsage verbosity
 
     interface IDevice with
         member x.Handle = x.Handle

src/Aardvark.Rendering.Vulkan/Core/Memory/MemoryAllocator.fs

@@ -181,7 +181,7 @@ type internal MemoryAllocator (device: IDevice) =
                     Unchecked.defaultof<_>
 
         with :? VulkanException ->
-            this.PrintUsage Logger.Default
+            this.PrintUsage()
             reraise()
 
     member private this.CreateImage(imageCreateInfo: VkImageCreateInfo byref, preferDevice: bool, hostAccess: HostAccess,
@@ -202,7 +202,7 @@ type internal MemoryAllocator (device: IDevice) =
                     Unchecked.defaultof<_>
 
         with :? VulkanException ->
-            this.PrintUsage Logger.Default
+            this.PrintUsage()
             reraise()
 
     member this.GetMemory(preferDevice: bool, hostAccess: HostAccess) =
@@ -218,7 +218,8 @@ type internal MemoryAllocator (device: IDevice) =
                 this.CreateImage(&info, preferDevice, hostAccess, priority, export, bind, mayAlias)
         }
 
-    member _.PrintUsage(l: ILogger) =
+    member _.PrintUsage([<Optional; DefaultParameterValue(2)>] verbosity: int) =
+        let l = Logger.Get verbosity
         let heaps = device.PhysicalDevice.MemoryHeaps
 
         let heapBudgets = Array.zeroCreate<VmaBudget> heaps.Length

src/Aardvark.Rendering.Vulkan/Core/Platform/Instance.fs

@@ -371,7 +371,7 @@ type Instance(apiVersion : Version, layers : list<string>, extensions : list<str
 
     member x.Devices = devicesAndGroups
 
-    member x.PrintInfo(l : ILogger, chosenDevice : PhysicalDevice) =
+    member x.PrintInfo(chosenDevice: PhysicalDevice, [<Optional; DefaultParameterValue(2)>] verbosity: int) =
         let devices =
             match chosenDevice with
                 | :? PhysicalDeviceGroup as g -> g.Devices
@@ -393,7 +393,7 @@ type Instance(apiVersion : Version, layers : list<string>, extensions : list<str
                 else None
             ) |> String.concat ", "
 
-
+        let l = Logger.Get verbosity
         l.section "instance:" (fun () ->
             l.section "layers:" (fun () ->
                 for layer in availableLayers do

src/Aardvark.Rendering.Vulkan/Core/Utilities/Logger.fs

@@ -2,21 +2,19 @@
 
 open Aardvark.Base
 
-type ILogger =
+type internal ILogger =
     abstract member section<'a, 'x>     : Printf.StringFormat<'a, (unit -> 'x) -> 'x> -> 'a
     abstract member line<'a, 'x>        : Printf.StringFormat<'a, unit> -> 'a
     abstract member WithVerbosity       : int -> ILogger
     abstract member Verbosity           : int
 
-type Logger private(verbosity : int) =
-    static let instances = Array.init 6 (fun i -> Logger(i) :> ILogger)
-
-    static member Default = instances.[2]
-    static member Get v = instances.[v]
+type internal Logger private(verbosity : int) =
+    static member Default = Logger.Get 2
+    static member Get v = Logger(v) :> ILogger
 
     interface ILogger with
         member x.Verbosity = verbosity
-        member x.WithVerbosity(v) = instances.[v]
+        member x.WithVerbosity(v) = Logger.Get v
         member x.section (fmt : Printf.StringFormat<'a, (unit -> 'x) -> 'x>) =
             fmt |> Printf.kprintf (fun (str : string) ->
                 fun cont ->

src/Aardvark.Rendering.Vulkan/Runtime/Headless.fs

@@ -47,8 +47,7 @@ type HeadlessVulkanApplication(debug : IDebugConfig, instanceExtensions : list<s
         else
             ConsoleDeviceChooser.run (CustomDeviceChooser.Filter instance.Devices)
 
-    let logger = Logger.Get debug.PlatformInformationVerbosity
-    do instance.PrintInfo(logger, physicalDevice)
+    do instance.PrintInfo(physicalDevice, debug.PlatformInformationVerbosity)
 
     // create a device
     let device =