Skip to content

Commit dd2bad7

Browse files
committed
Remove obsolete code
1 parent 6c7f443 commit dd2bad7

5 files changed

Lines changed: 3 additions & 41 deletions

File tree

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,6 @@ type PhysicalDevice internal(instance: IVulkanInstance, handle: VkPhysicalDevice
201201
let properties = x.GetFormatProperties(format)
202202
if tiling = VkImageTiling.Optimal then properties.optimalTilingFeatures else properties.linearTilingFeatures
203203

204-
[<Obsolete("Use GetImageFormatFeatures instead.")>]
205-
member x.GetFormatFeatures(tiling : VkImageTiling, fmt : VkFormat) =
206-
x.GetImageFormatFeatures(fmt, tiling)
207-
208204
member internal x.GetImageProperties(format : VkFormat, typ : VkImageType, tiling : VkImageTiling, usage : VkImageUsageFlags,
209205
flags : VkImageCreateFlags, external : VkExternalMemoryHandleTypeFlags) =
210206
let key = (format, typ, tiling, usage, flags, external)

src/Aardvark.Rendering.Vulkan/Swapchain/Surface.fs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,6 @@ type Surface(device : Device, handle : VkSurfaceKHR) =
199199

200200
{| Current = current; Min = toInt2D caps.minImageExtent; Max = toInt2D caps.maxImageExtent |}
201201

202-
[<Obsolete("Use Extent.Current instead.")>]
203-
member x.Size = x.Extent.Current
204-
205-
[<Obsolete("Use Extent.Min instead.")>]
206-
member x.MinSize = x.Extent.Min
207-
208-
[<Obsolete("Use Extent.Max instead.")>]
209-
member x.MaxSize = x.Extent.Max
210-
211202
member x.HasCompositeAlpha (t : VkCompositeAlphaFlagsKHR) = (t &&& supportedCompositeAlpha) = t
212203
member x.HasUsage (t : VkImageUsageFlags) = (t &&& supportedUsage) = t
213204

src/Aardvark.Rendering.Vulkan/Swapchain/Swapchain.fs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,6 @@ type Swapchain(device : Device, initialSize : V2i, description : SwapchainDescri
206206
resolvedImage <- newResolvedImage
207207
currentBuffer <- 0u
208208

209-
[<Obsolete>]
210-
new (device : Device, description : SwapchainDescription) =
211-
new Swapchain(device, V2i(1024, 768), description)
212-
213209
member x.Size = update(); size
214210
member x.Description = description
215211
member x.Samples = description.samples
@@ -392,19 +388,15 @@ type Swapchain(device : Device, initialSize : V2i, description : SwapchainDescri
392388
[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
393389
module Swapchain =
394390

395-
let create2 (size : V2i) (description : SwapchainDescription) (device : Device) =
391+
let create (size : V2i) (description : SwapchainDescription) (device : Device) =
396392
new Swapchain(device, size, description)
397393

398-
[<Obsolete("Use Swapchain.create2 instead.")>]
399-
let create (desc : SwapchainDescription) (device : Device) =
400-
create2 (V2i(1024, 768)) desc device
401-
402394
[<AbstractClass; Sealed; Extension>]
403395
type DeviceSwapchainExtensions private() =
404396

405397
[<Extension>]
406398
static member CreateSwapchain(this : Device, size : V2i, description : SwapchainDescription) =
407-
this |> Swapchain.create2 size description
399+
this |> Swapchain.create size description
408400

409401
[<Extension>]
410402
static member CreateSwapchain(this : Device, description : SwapchainDescription) =

src/Aardvark.Rendering/Resources/Adaptive/AdaptiveRenderbuffers.fs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -171,18 +171,4 @@ type ITextureRuntimeAdaptiveRenderbufferExtensions private() =
171171
[<Optional; DefaultParameterValue(0)>] level : int,
172172
[<Optional; DefaultParameterValue(-1)>] slice : int) =
173173
let aspect = texture |> AVal.mapNonAdaptive _.Format.Aspect
174-
AdaptiveTextureAttachment(texture, aspect, ~~level, ~~slice) :> IAdaptiveFramebufferOutput
175-
176-
[<Extension; System.Obsolete("Use texture.GetOutputView() instead. Note that slice and level parameter positions are switched.")>]
177-
static member CreateTextureAttachment(_ : ITextureRuntime, texture : IAdaptiveResource<#IBackendTexture>, slice : aval<int>, level : aval<int>) =
178-
texture.GetOutputView(level, slice)
179-
180-
[<Extension; System.Obsolete("Use texture.GetOutputView() instead. Note that slice and level parameter positions are switched.")>]
181-
static member CreateTextureAttachment(_ : ITextureRuntime, texture : IAdaptiveResource<#IBackendTexture>, slice : aval<int>) =
182-
texture.GetOutputView(~~0, slice)
183-
184-
[<Extension; System.Obsolete("Use texture.GetOutputView() instead. Note that slice and level parameter positions are switched.")>]
185-
static member CreateTextureAttachment(_ : ITextureRuntime, texture : IAdaptiveResource<#IBackendTexture>,
186-
[<Optional; DefaultParameterValue(-1)>] slice : int,
187-
[<Optional; DefaultParameterValue(0)>] level : int) =
188-
texture.GetOutputView(level, slice)
174+
AdaptiveTextureAttachment(texture, aspect, ~~level, ~~slice) :> IAdaptiveFramebufferOutput

src/Aardvark.SceneGraph/Semantics/Trafo.fs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ module TrafoExtensions =
3232
module TrafoSemantics =
3333
open TrafoOperators
3434

35-
[<Obsolete>]
36-
let rootTrafo = Trafo3d.identity
37-
3835
let flattenStack (stack : aval<Trafo3d> list) =
3936
let rec foldConstants (l : aval<Trafo3d> list) =
4037
match l with

0 commit comments

Comments
 (0)