Skip to content

Commit

Permalink
removed obsolete uses of ExecutableMemory
Browse files Browse the repository at this point in the history
  • Loading branch information
krauthaufen committed Aug 4, 2022
1 parent 7557dee commit 4be6e7c
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 33 deletions.
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 5.2.9-prerelease0001
- test release
- moved to Aardvark.Assembler

### 5.2.8
- fixed GLFW init problem

Expand Down
14 changes: 7 additions & 7 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ nuget CSharp.Data.Adaptive ~> 1.2.6

nuget Aardvark.Base.TypeProviders ~> 4.5.15

nuget Aardvark.Base.FSharp ~> 5.2.7
nuget Aardvark.Base.IO ~> 5.2.7
nuget Aardvark.Base.Incremental ~> 5.2.7
nuget Aardvark.Base.Runtime ~> 5.2.7
nuget Aardvark.Base.Essentials ~> 5.2.7
nuget Aardvark.Geometry ~> 5.2.7
nuget Aardvark.Base.Tensors ~> 5.2.7
nuget Aardvark.Base.FSharp ~> 5.2.9
nuget Aardvark.Base.IO ~> 5.2.9
nuget Aardvark.Base.Incremental ~> 5.2.9
nuget Aardvark.Base.Runtime ~> 5.2.9
nuget Aardvark.Base.Essentials ~> 5.2.9
nuget Aardvark.Geometry ~> 5.2.9
nuget Aardvark.Base.Tensors ~> 5.2.9

nuget Aardvark.Assembler ~> 0.0.3

Expand Down
46 changes: 23 additions & 23 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,53 +10,53 @@ NUGET
Aardvark.Base.Runtime (>= 5.2.7 < 5.3)
FSharp.Core (>= 5.0)
FSharp.Data.Adaptive (>= 1.2.13 < 1.3)
Aardvark.Base (5.2.7)
Aardvark.Base.Telemetry (5.2.7)
Aardvark.Base (5.2.9)
Aardvark.Base.Telemetry (5.2.9)
System.Collections.Immutable (>= 5.0)
System.Reflection.Metadata (>= 5.0) - restriction: || (== net471) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
System.Text.Json (>= 4.7.2)
Aardvark.Base.Essentials (5.2.7)
Aardvark.Base (5.2.7)
Aardvark.Base.Essentials (5.2.9)
Aardvark.Base (5.2.9)
System.Collections.Immutable (>= 5.0)
Aardvark.Base.FSharp (5.2.7)
Aardvark.Base (5.2.7)
Aardvark.Base.FSharp (5.2.9)
Aardvark.Base (5.2.9)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 5.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.2.7)
Aardvark.Base (5.2.7)
Aardvark.Base.FSharp (5.2.7)
Aardvark.Base.Incremental (5.2.9)
Aardvark.Base (5.2.9)
Aardvark.Base.FSharp (5.2.9)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 5.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
FsPickler (>= 5.3.2 < 5.4)
Aardvark.Base.IO (5.2.7)
Aardvark.Base (5.2.7)
Aardvark.Base.Tensors (5.2.7)
Aardvark.Base.IO (5.2.9)
Aardvark.Base (5.2.9)
Aardvark.Base.Tensors (5.2.9)
System.Dynamic.Runtime (>= 4.3 < 4.4)
Aardvark.Base.Runtime (5.2.7)
Aardvark.Base.FSharp (5.2.7)
Aardvark.Base.Incremental (5.2.7)
Aardvark.Base.Runtime (5.2.9)
Aardvark.Base.FSharp (5.2.9)
Aardvark.Base.Incremental (5.2.9)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 5.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
FsPickler (>= 5.3.2 < 5.4)
Aardvark.Base.Telemetry (5.2.7)
Aardvark.Base.Tensors (5.2.7)
Aardvark.Base (5.2.7)
Aardvark.Base.FSharp (5.2.7)
Aardvark.Base.Telemetry (5.2.9)
Aardvark.Base.Tensors (5.2.9)
Aardvark.Base (5.2.9)
Aardvark.Base.FSharp (5.2.9)
FSharp.Core (>= 5.0)
SixLabors.ImageSharp (>= 2.0 < 2.1)
Aardvark.Base.TypeProviders (4.5.15)
FSharp.Core (>= 3.1.2.5) - restriction: || (== net471) (&& (== net6.0) (>= net45)) (&& (== netcoreapp3.1) (>= net45)) (&& (== netstandard2.0) (>= net45))
FSharp.Core (>= 4.2.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== netcoreapp3.1) (== netstandard2.0)
Aardvark.Build (1.0.11)
Aardvark.Geometry (5.2.7)
Aardvark.Base (5.2.7)
Aardvark.Base.FSharp (5.2.7)
Aardvark.Base.Tensors (5.2.7)
Aardvark.Geometry (5.2.9)
Aardvark.Base (5.2.9)
Aardvark.Base.FSharp (5.2.9)
Aardvark.Base.Tensors (5.2.9)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 5.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
Expand Down
9 changes: 7 additions & 2 deletions src/Aardvark.Rendering.GL/Runtime/GeometryPool.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,9 @@ type DrawPool(ctx : Context, alphaToCoverage : bool, bounds : bool, renderBounds
let isOutdated = NativePtr.allocArray [| 1 |]
let updateFun = Marshal.PinDelegate(new System.Action(this.Update))
let mutable oldCalls : list<Option<DrawElementsType> * nativeptr<GLBeginMode> * VertexInputBindingHandle * array<int*int*int> * IndirectBuffer> = []
let program = new ChangeableNativeProgram<_, _>((fun a s -> compile a (AssemblerCommandStream s)), NativeStats.Zero, (+), (-))
let program =
new Aardvark.Assembler.FragmentProgram<_>(fun a (s : IAssemblerStream) -> compile a (AssemblerCommandStream s :> ICommandStream) |> ignore)
//new ChangeableNativeProgram<_, _>((fun a s -> compile a (AssemblerCommandStream s)), NativeStats.Zero, (+), (-))
let puller =
{ new AdaptiveObject() with
override x.MarkObject() =
Expand Down Expand Up @@ -1659,7 +1661,10 @@ type DrawPool(ctx : Context, alphaToCoverage : bool, bounds : bool, renderBounds
)

program.Clear()
for a in calls do program.Add a |> ignore
let mutable last = null
for a in calls do
let f = program.InsertAfter(last, a)
last <- f

oldCalls |> List.iter (fun (_,beginMode,bufferBinding,_,indirect) ->
NativePtr.free beginMode; ctx.Delete bufferBinding
Expand Down
2 changes: 1 addition & 1 deletion src/Aardvark.Rendering.Vulkan/Core/Platform.fs
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ module ConsoleDeviceChooser =


let altDown() =
let dpy = XOpenDisplay(0)
let dpy = XOpenDisplay(0n)
let keys = Array.zeroCreate<byte> 256
XQueryKeymap(dpy, keys) |> ignore
let kc2 = XKeysymToKeycode(dpy, XK_Alt_L) |> int
Expand Down

0 comments on commit 4be6e7c

Please sign in to comment.