Skip to content

Commit fd8d4aa

Browse files
committed
Annotate extension classes as abstract, sealed, and extension
Older F# compilers require an extension attribute on class level as well as method level. See: fsharp/fslang-suggestions#835
1 parent 71b4324 commit fd8d4aa

File tree

23 files changed

+24
-24
lines changed

23 files changed

+24
-24
lines changed

src/Aardvark.Rendering.Common/Camera/Frustum.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ module Frustum =
121121
let inline bottom (f : Frustum) = f.bottom
122122
let inline top (f : Frustum) = f.top
123123

124-
[<Extension;AutoOpen>]
124+
[<AbstractClass; Sealed; Extension>]
125125
type CameraCSharpExtensions() =
126126
[<Extension>]
127127
static member ProjTrafo(f : Frustum) = Frustum.projTrafo f

src/Aardvark.Rendering.GL/Resources/Textures/TextureCopy.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ module internal ImageCopyImplementation =
233233
[<AutoOpen>]
234234
module ContextTextureCopyExtensions =
235235

236-
[<Extension; AbstractClass; Sealed>]
236+
[<AbstractClass; Sealed; Extension>]
237237
type ContextTextureCopyExtensions =
238238

239239
// ================================================================================================================

src/Aardvark.Rendering.GL/Resources/Textures/TextureDownload.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ module ContextTextureDownloadExtensions =
294294
texture |> dl level slice offset size
295295
)
296296

297-
[<Extension; AbstractClass; Sealed>]
297+
[<AbstractClass; Sealed; Extension>]
298298
type ContextTextureDownloadExtensions =
299299

300300
[<Extension>]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type Command() =
1515
abstract member Compatible : QueueFlags
1616
abstract member Enqueue : CommandBuffer -> unit
1717

18-
[<AbstractClass; Sealed>]
18+
[<AbstractClass; Sealed; Extension>]
1919
type CommandExtensions() =
2020

2121
[<Extension>]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ module IDeviceObjectExtensions =
346346
type IDeviceObject with
347347
member inline x.Device = x.DeviceInterface :?> Device
348348

349-
[<AbstractClass; Sealed>]
349+
[<AbstractClass; Sealed; Extension>]
350350
type DeviceExtensions private() =
351351

352352
[<Extension>]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ module private DebugReportHelpers =
328328

329329
objectTraces.AddOrUpdate(handle, stack, fun _ _ -> stack) |> ignore
330330

331-
[<AbstractClass; Sealed>]
331+
[<AbstractClass; Sealed; Extension>]
332332
type InstanceDebugReportExtensions private() =
333333

334334
[<Extension>]

src/Aardvark.Rendering.Vulkan/Resources/Buffers/Buffer.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ module BufferView =
531531
// =======================================================================
532532
// Device Extensions
533533
// =======================================================================
534-
[<AbstractClass; Sealed>]
534+
[<AbstractClass; Sealed; Extension>]
535535
type BufferExtensions private() =
536536

537537
[<Extension>]

src/Aardvark.Rendering.Vulkan/Resources/Buffers/IndirectBuffer.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ module IndirectBuffer =
106106

107107
new IndirectBuffer(buffer, b.Count)
108108

109-
[<AbstractClass; Sealed>]
109+
[<AbstractClass; Sealed; Extension>]
110110
type ContextIndirectBufferExtensions private() =
111111

112112
[<Extension>]

src/Aardvark.Rendering.Vulkan/Resources/Buffers/UniformBuffer.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ module UniformBuffer =
124124
do! Command.Sync(b, VkPipelineStageFlags.TransferBit, VkAccessFlags.TransferWriteBit)
125125
}
126126

127-
[<AbstractClass; Sealed>]
127+
[<AbstractClass; Sealed; Extension>]
128128
type ContextUniformBufferExtensions private() =
129129
[<Extension>]
130130
static member inline CreateUniformBuffer(this : Device, layout : FShade.GLSL.GLSLUniformBuffer) =

src/Aardvark.Rendering.Vulkan/Resources/GeometryPool.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module GeometryPoolUtilities =
7575
member x.OnLock c = rlock.OnLock c
7676
member x.OnUnlock c = rlock.OnUnlock c
7777

78-
[<AbstractClass; Sealed>]
78+
[<AbstractClass; Sealed; Extension>]
7979
type DeviceMappedBufferExts private() =
8080

8181

src/Aardvark.Rendering.Vulkan/Resources/Image/ImageBuffer.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module internal ImageBuffer =
2424
let buffer = memory |> Buffer.create usage sizeInBytes
2525
new ImageBuffer(buffer, size, pitch, format)
2626

27-
[<AbstractClass; Sealed>]
27+
[<AbstractClass; Sealed; Extension>]
2828
type ImageBufferExtensions private() =
2929

3030
[<Extension>]

src/Aardvark.Rendering.Vulkan/Resources/Image/ImageDownload.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ module ImageDownloadExtensions =
232232
buffer.Dispose()
233233

234234

235-
[<AbstractClass; Sealed>]
235+
[<AbstractClass; Sealed; Extension>]
236236
type ContextImageDownloadExtensions private() =
237237

238238
[<Extension>]

src/Aardvark.Rendering.Vulkan/Resources/Image/TensorImage.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ module TensorImage =
343343
dst
344344

345345

346-
[<AbstractClass; Sealed>]
346+
[<AbstractClass; Sealed; Extension>]
347347
type DeviceTensorExtensions private() =
348348

349349
[<Extension>]

src/Aardvark.Rendering.Vulkan/Resources/Query/QueryPool.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ module QueryCommandExtensions =
115115
VkRaw.vkCmdWriteTimestamp(cmd.Handle, pipelineFlags, pool.Handle, uint32 index)
116116
}
117117

118-
[<AbstractClass; Sealed>]
118+
[<AbstractClass; Sealed; Extension>]
119119
type DeviceQueryPoolExtensions private() =
120120
[<Extension>]
121121
static member inline CreateQueryPool(device : Device, count : int) =

src/Aardvark.Rendering/Common/ClearValuesCSharp.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type ClearStencil =
5050
static member op_Explicit(value : ClearStencil) = uint8 value.Value
5151
static member op_Explicit(value : ClearStencil) = uint16 value.Value
5252

53-
[<Extension; Sealed>]
53+
[<AbstractClass; Sealed; Extension>]
5454
type ClearDepthStencilExtensions private () =
5555

5656
[<Extension>]
@@ -98,7 +98,7 @@ type Clear private () =
9898
static member Stencil(value : ClearStencil) =
9999
ClearValues.empty |> ClearValues.stencil value.Value
100100

101-
[<Extension; AbstractClass; Sealed>]
101+
[<AbstractClass; Sealed; Extension>]
102102
type ClearValuesExtensions =
103103

104104
[<Extension>]

src/Aardvark.Rendering/Common/Queries.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type IQuery =
1414
/// Finishes the query.
1515
abstract member End : unit -> unit
1616

17-
[<Extension; Sealed>]
17+
[<AbstractClass; Sealed; Extension>]
1818
type IQueryExtensions private() =
1919

2020
/// Resets the queries manually.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type IAdaptiveBuffer =
3030
/// <param name="sizeInBytes">The number of bytes to write to the buffer.</param>
3131
abstract member Write : data: nativeint * offset: nativeint * sizeInBytes: nativeint -> unit
3232

33-
[<Extension; Sealed>]
33+
[<AbstractClass; Sealed; Extension>]
3434
type AdaptiveBufferExtensions private() =
3535

3636
/// <summary>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ module internal CompactBufferImplementation =
184184
for w in pending.GetAndClear() do
185185
w.Write(token)
186186

187-
[<Extension; Sealed>]
187+
[<AbstractClass; Sealed; Extension>]
188188
type RuntimeAdaptiveCompactBufferExtensions private() =
189189

190190
/// <summary>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type IManagedBuffer =
4545
type IManagedBuffer<'T when 'T : unmanaged> =
4646
inherit IManagedBuffer
4747

48-
[<Extension; Sealed>]
48+
[<AbstractClass; Sealed; Extension>]
4949
type ManagedBufferExtensions private() =
5050

5151
/// <summary>

src/Aardvark.Rendering/Resources/Textures/Compression.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ module BlockCompression =
114114

115115
index
116116

117-
[<Extension; Sealed>]
117+
[<AbstractClass; Sealed; Extension>]
118118
type private VolumeExtensions() =
119119

120120
[<Extension>]

src/Aardvark.Rendering/Runtime/Raytracing/RaytracingRuntime.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ and [<RequireQualifiedAccess>]
8080
RaytracingCommand.TransformLayout(texture, TextureLayout.ShaderWrite, dstLayout) ]
8181

8282

83-
[<Extension>]
83+
[<AbstractClass; Sealed; Extension>]
8484
type RaytracingTaskExtensions() =
8585

8686
/// Updates the resources of the task without running it.

src/Aardvark.Rendering/Runtime/Raytracing/TraceToExtensions.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ open FSharp.Data.Adaptive
66
open System.Runtime.InteropServices
77
open System.Runtime.CompilerServices
88

9-
[<Extension>]
9+
[<AbstractClass; Sealed; Extension>]
1010
type CompileTraceToExtensions() =
1111

1212
/// <summary>

src/Aardvark.Rendering/Runtime/Runtime.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ and IRuntime =
9292
/// Gets or sets the path of the shader cache.
9393
abstract member ShaderCachePath : Option<string> with get, set
9494

95-
[<Extension>]
95+
[<AbstractClass; Sealed; Extension>]
9696
type RenderTaskRunExtensions() =
9797

9898
[<Extension>]

0 commit comments

Comments
 (0)