OpenGL/WPF control uses tasks for rendering (avoiding stack-inlining …

…due to STAThread)
aardvark-platform · Nov 4, 2024 · 6c0555d · 6c0555d
1 parent 0eede77
commit 6c0555d
Show file tree

Hide file tree

Showing 5 changed files with 385 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 5.5.5
+- OpenGL/WPF control uses tasks for rendering (avoiding stack-inlining due to STAThread)
+
 ### 5.5.4
 - OpenGL/WPF control uses `OnPainRender` again
 

diff --git a/src/Application/Aardvark.Application.WPF.GL/Aardvark.Application.WPF.GL.fsproj b/src/Application/Aardvark.Application.WPF.GL/Aardvark.Application.WPF.GL.fsproj
@@ -18,6 +18,7 @@
     <OutputPath>..\..\..\bin\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="ThreadedRenderControl.fs" />
     <Compile Include="RenderControl.fs" />
     <Compile Include="SharingRenderControl.fs" />
     <Compile Include="Application.fs" />

diff --git a/src/Application/Aardvark.Application.WPF.GL/RenderControl.fs b/src/Application/Aardvark.Application.WPF.GL/RenderControl.fs
@@ -6,7 +6,7 @@ open System.Windows.Forms.Integration
 open Aardvark.Application
 open System.Windows.Threading
 
-type private WinFormsControl = Aardvark.Application.WinForms.OpenGlRenderControl
+type private WinFormsControl = Aardvark.Application.WinForms.ThreadedRenderControl
 
 type OpenGlRenderControl(runtime : Runtime, debug : IDebugConfig, samples : int) as this =
     inherit WindowsFormsHost()
@@ -27,7 +27,6 @@ type OpenGlRenderControl(runtime : Runtime, debug : IDebugConfig, samples : int)
 //    do ctrl.AutoInvalidate <- false
 
     do this.Child <- ctrl
-       //ctrl.OnPaintRender <- false
        this.Loaded.Add(fun e -> this.Focusable <- false)
 
     //override x.OnDpiChanged(oldDpi : DpiScale, newDpi : DpiScale) =