Skip to content

Commit

Permalink
Update Aardvark.Base packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@hyazinthh
hyazinthh committed Jul 24, 2024
1 parent 10a09da commit 69a5291
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 55 deletions.
12 changes: 6 additions & 6 deletions paket.dependencies
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ nuget CSharp.Data.Adaptive ~> 1.2.13

nuget Aardvark.Base.TypeProviders ~> 4.5.15

nuget Aardvark.Base.FSharp ~> 5.3.0-prerelease0003
nuget Aardvark.Base.IO ~> 5.3.0-prerelease0003
nuget Aardvark.Base.Incremental ~> 5.3.0-prerelease0003
nuget Aardvark.Base.Essentials ~> 5.3.0-prerelease0003
nuget Aardvark.Geometry ~> 5.3.0-prerelease0003
nuget Aardvark.Base.Tensors ~> 5.3.0-prerelease0003
nuget Aardvark.Base.FSharp ~> 5.3.0-prerelease0005
nuget Aardvark.Base.IO ~> 5.3.0-prerelease0005
nuget Aardvark.Base.Incremental ~> 5.3.0-prerelease0005
nuget Aardvark.Base.Essentials ~> 5.3.0-prerelease0005
nuget Aardvark.Geometry ~> 5.3.0-prerelease0005
nuget Aardvark.Base.Tensors ~> 5.3.0-prerelease0005

nuget Aardvark.Assembler ~> 0.1.0-prerelease0001

Expand Down
60 changes: 30 additions & 30 deletions paket.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,45 +10,45 @@ NUGET
Aardvark.Base.FSharp (>= 5.3.0-prerelease0002)
FSharp.Core (>= 8.0)
FSharp.Data.Adaptive (>= 1.2.13 < 1.3)
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.Telemetry (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.Telemetry (5.3.0-prerelease0005)
System.Collections.Immutable (>= 8.0)
System.Reflection.Metadata (>= 8.0)
System.Text.Json (>= 8.0.4)
Aardvark.Base.Essentials (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.Essentials (5.3.0-prerelease0005)
Aardvark.Base (5.3.0-prerelease0005)
System.Collections.Immutable (>= 8.0)
Aardvark.Base.FSharp (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.FSharp (5.3.0-prerelease0005)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 8.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
FsPickler (>= 5.3.2 < 5.4)
System.Dynamic.Runtime (>= 4.3 < 4.4)
Aardvark.Base.Incremental (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.FSharp (5.3.0-prerelease0004)
Aardvark.Base.Incremental (5.3.0-prerelease0005)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.FSharp (5.3.0-prerelease0005)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 8.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
FsPickler (>= 5.3.2 < 5.4)
Aardvark.Base.IO (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.Tensors (5.3.0-prerelease0004)
Aardvark.Base.IO (5.3.0-prerelease0005)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.Tensors (5.3.0-prerelease0005)
System.Dynamic.Runtime (>= 4.3 < 4.4)
Aardvark.Base.Telemetry (5.3.0-prerelease0004)
Aardvark.Base.Tensors (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.FSharp (5.3.0-prerelease0004)
Aardvark.Base.Telemetry (5.3.0-prerelease0005)
Aardvark.Base.Tensors (5.3.0-prerelease0005)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.FSharp (5.3.0-prerelease0005)
FSharp.Core (>= 8.0)
Aardvark.Base.TypeProviders (4.5.15)
FSharp.Core (>= 3.1.2.5) - restriction: || (== net471) (&& (== net8.0) (>= net45)) (&& (== net8.0-windows10.0.17763.0) (>= net45)) (&& (== netstandard2.0) (>= net45))
FSharp.Core (>= 4.2.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
Aardvark.Build (1.0.24)
Aardvark.Geometry (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.FSharp (5.3.0-prerelease0004)
Aardvark.Base.Tensors (5.3.0-prerelease0004)
Aardvark.Geometry (5.3.0-prerelease0005)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.FSharp (5.3.0-prerelease0005)
Aardvark.Base.Tensors (5.3.0-prerelease0005)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 8.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
Expand Down Expand Up @@ -357,22 +357,22 @@ STORAGE: NONE
RESTRICTION: == net8.0
NUGET
remote: https://api.nuget.org/v3/index.json
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.Telemetry (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.Telemetry (5.3.0-prerelease0005)
System.Collections.Immutable (>= 8.0)
System.Reflection.Metadata (>= 8.0)
System.Text.Json (>= 8.0.4)
Aardvark.Base.FSharp (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.FSharp (5.3.0-prerelease0005)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 8.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
FsPickler (>= 5.3.2 < 5.4)
System.Dynamic.Runtime (>= 4.3 < 4.4)
Aardvark.Base.Telemetry (5.3.0-prerelease0004)
Aardvark.Base.Tensors (5.3.0-prerelease0004)
Aardvark.Base (5.3.0-prerelease0004)
Aardvark.Base.FSharp (5.3.0-prerelease0004)
Aardvark.Base.Telemetry (5.3.0-prerelease0005)
Aardvark.Base.Tensors (5.3.0-prerelease0005)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.FSharp (5.3.0-prerelease0005)
FSharp.Core (>= 8.0)
Aardvark.Base.TypeProviders (4.5.15)
FSharp.Core (>= 4.2.3)
Expand Down Expand Up @@ -404,7 +404,7 @@ NUGET
Hopac (>= 0.4.1)
FsCheck (2.16.6)
FSharp.Core (>= 4.2.3)
FSharp.Core (8.0.100)
FSharp.Core (8.0.301)
FSharp.Data.Adaptive (1.2.15)
FSharp.Core (>= 4.7)
System.Reflection.Emit.Lightweight (>= 4.6)
Expand Down Expand Up @@ -457,7 +457,7 @@ NUGET
Newtonsoft.Json (13.0.3)
Perfolizer (0.2.1)
System.Memory (>= 4.5.3)
SixLabors.ImageSharp (2.1.8)
SixLabors.ImageSharp (2.1.9)
System.Runtime.CompilerServices.Unsafe (>= 5.0)
System.Text.Encoding.CodePages (>= 5.0)
System.CodeDom (8.0)
Expand Down
8 changes: 4 additions & 4 deletions src/Aardvark.Rendering.GL/Resources/Textures/TextureUpload.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ module internal TextureUploadImplementation =
uploadPixImageMipMapInternal texture wantMipmap generateMipmap baseLevel slice offset images


let uploadPixImageCube (texture : Texture) (wantMipmap : bool)
(baseLevel : int) (slice : int) (offset : V2i) (data : PixImageCube) =
let uploadPixCube (texture : Texture) (wantMipmap : bool)
(baseLevel : int) (slice : int) (offset : V2i) (data : PixCube) =
let generateMipmap =
wantMipmap && data.MipMapArray |> Array.exists (fun i -> i.LevelCount < texture.MipMapLevels)

Expand Down Expand Up @@ -295,7 +295,7 @@ module ContextTextureUploadExtensions =

let (|PixTextureCube|_|) (t : ITexture) =
match t with
| :? PixTextureCube as t -> Some(PixTextureCube(t.TextureParams, t.PixImageCube))
| :? PixTextureCube as t -> Some(PixTextureCube(t.TextureParams, t.PixCube))
| _ -> None

let (|PixTexture2D|_|) (t : ITexture) =
Expand Down Expand Up @@ -355,7 +355,7 @@ module ContextTextureUploadExtensions =
let img = data.[CubeSide.NegativeX]
let levels = data.MipMapArray |> Array.map (fun pi -> pi.LevelCount) |> Array.min
let texture = this |> Texture.createOfFormatCube img.BaseImage.PixFormat img.[0].Size.X levels info
Texture.uploadPixImageCube texture info.wantMipMaps 0 0 V2i.Zero data
Texture.uploadPixCube texture info.wantMipMaps 0 0 V2i.Zero data
texture

| PixTexture3D(info, data) ->
Expand Down
4 changes: 2 additions & 2 deletions src/Aardvark.Rendering.Vulkan/Resources/Image/ImageUpload.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ module ImageUploadExtensions =
let buffer = device |> ImageBuffer.ofPixVolume info data
device |> ofImageBuffer TextureDimension.Texture3D info.wantMipMaps buffer export

let ofPixImageCube (data : PixImageCube) (info : TextureParams) (export : bool) (device : Device) =
let ofPixCube (data : PixCube) (info : TextureParams) (export : bool) (device : Device) =
let buffers = device |> ImageBufferArray.ofPixImageMipMaps info data.MipMapArray
device |> ofImageBufferArray TextureDimension.TextureCube info.wantMipMaps export buffers

Expand Down Expand Up @@ -337,7 +337,7 @@ module ImageUploadExtensions =
device |> ofPixImageMipMap t.PixImageMipMap t.TextureParams export

| :? PixTextureCube as c ->
device |> ofPixImageCube c.PixImageCube c.TextureParams export
device |> ofPixCube c.PixCube c.TextureParams export

| :? NullTexture ->
let properties =
Expand Down
4 changes: 2 additions & 2 deletions src/Aardvark.Rendering.Vulkan/Resources/Image/TensorImage.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,15 +369,15 @@ type DeviceTensorExtensions private() =
device.CreateTensorImage2D(data, data.LevelCount, srgb)

[<Extension>]
static member inline CreateTensorImageCube(device : Device, data : PixImageCube, levels : int, srgb : bool) : TensorImageCube =
static member inline CreateTensorImageCube(device : Device, data : PixCube, levels : int, srgb : bool) : TensorImageCube =
new TensorImageCube(
data.MipMapArray |> Array.map (fun face ->
device.CreateTensorImage2D(face, levels, srgb)
)
)

[<Extension>]
static member inline CreateTensorImageCube(device : Device, data : PixImageCube, srgb : bool) =
static member inline CreateTensorImageCube(device : Device, data : PixCube, srgb : bool) =
device.CreateTensorImageCube(data, data.MipMapArray.[0].LevelCount, srgb)

[<Extension>]
Expand Down
18 changes: 9 additions & 9 deletions src/Aardvark.Rendering/Resources/Textures/PixTextureCube.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
open Aardvark.Base
open System.Runtime.InteropServices

type PixTextureCube(data : PixImageCube, textureParams : TextureParams) =
type PixTextureCube(data : PixCube, textureParams : TextureParams) =

member x.PixImageCube = data
member x.PixCube = data
member x.TextureParams = textureParams

new(data : PixImageCube, [<Optional; DefaultParameterValue(true)>] wantMipMaps : bool) =
new(data : PixCube, [<Optional; DefaultParameterValue(true)>] wantMipMaps : bool) =
PixTextureCube(data, { TextureParams.empty with wantMipMaps = wantMipMaps })

override x.GetHashCode() =
Expand All @@ -17,7 +17,7 @@ type PixTextureCube(data : PixImageCube, textureParams : TextureParams) =
override x.Equals o =
match o with
| :? PixTextureCube as o ->
data = o.PixImageCube && textureParams = o.TextureParams
data = o.PixCube && textureParams = o.TextureParams
| _ ->
false

Expand All @@ -26,17 +26,17 @@ type PixTextureCube(data : PixImageCube, textureParams : TextureParams) =


[<AutoOpen>]
module PixImageCubeTextureExtensions =
module PixCubeTextureExtensions =

open System.Runtime.CompilerServices

[<AbstractClass; Sealed; Extension>]
type PixImageCubeExtensions private() =
type PixCubeExtensions private() =

[<Extension>]
static member ToTexture(this : PixImageCube, mipMaps : bool) =
static member ToTexture(this : PixCube, mipMaps : bool) =
PixTextureCube(this, mipMaps) :> ITexture

module PixImageCube =
let toTexture (mipMaps : bool) (c : PixImageCube) =
module PixCube =
let toTexture (mipMaps : bool) (c : PixCube) =
c.ToTexture mipMaps
1 change: 0 additions & 1 deletion src/Examples (netcore)/04 - ModelLoading/04 - ModelLoading.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<None Include="paket.references" />
<Compile Include="Program.fs" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\..\Aardvark.Rendering\Aardvark.Rendering.fsproj" />
<ProjectReference Include="..\..\Aardvark.Rendering.GL\Aardvark.Rendering.GL.fsproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Aardvark.Rendering.Tests/Tests/Texture/Upload.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ module TextureUpload =
let toMipMap arr =
PixImageMipMap(arr |> Array.map (fun pi -> pi :> PixImage))

let pc = PixImageCube(data |> Array.map toMipMap)
let pc = PixCube(data |> Array.map toMipMap)
let pt = PixTextureCube(pc, textureParams)
runtime.PrepareTexture(pt)

Expand Down

0 comments on commit 69a5291

Please sign in to comment.