potential fix for #86: also apply multisampling to boundary in order …

…to *disable* multisampling properly. Unclear yet why outline only always needs multisampling
aardvark-platform · Nov 2, 2021 · b51c8a6 · b51c8a6
1 parent f2ea2d9
commit b51c8a6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+### 5.1.18
+
+- disabled multisampling for text outline - fix for https://github.com/aardvark-platform/aardvark.rendering/issues/86
+
 ### 5.1.17
 - fixed package dependeny to FSharp.Data.Adaptive
 - [Vulkan] fixed package dependency to GLSLangSharp

diff --git a/src/Aardvark.Rendering.Text/SceneGraph.fs b/src/Aardvark.Rendering.Text/SceneGraph.fs
@@ -227,7 +227,14 @@ module Sg =
             let pass = scope.RenderPass
             let pass = if pass = RenderPass.main then RenderPass.shapes else pass
 
-            shapes.RasterizerState.Multisample <- AVal.map2 (fun a f -> not f || a) aa fill
+
+            let multisample = 
+                (aa, fill) ||> AVal.map2 (fun a f -> 
+                    // @krauthaufen - why always multisampling when outline only?
+                    not f || a
+                )
+
+            shapes.RasterizerState.Multisample <- multisample
             shapes.RenderPass <- if pass = RenderPass.main then RenderPass.shapes else pass
             shapes.BlendState.Mode <- AVal.constant BlendMode.Blend
             shapes.VertexAttributes <- cache.VertexBuffers
@@ -364,7 +371,15 @@ module Sg =
 
             let pass = scope.RenderPass
             let pass = if pass = RenderPass.main then RenderPass.shapes else pass
-            shapes.RasterizerState.Multisample <- AVal.map2 (fun a f -> not f || a) aa fill
+
+
+            let multisample = 
+                (aa, fill) ||> AVal.map2 (fun a f -> 
+                    // @krauthaufen - why always multisampling when outline only?
+                    not f || a
+                )
+
+            shapes.RasterizerState.Multisample <- multisample
             shapes.RenderPass <- pass
             shapes.BlendState.Mode <- AVal.constant BlendMode.Blend
             shapes.VertexAttributes <- cache.VertexBuffers
@@ -376,6 +391,7 @@ module Sg =
             //shapes.WriteBuffers <- Some (Set.ofList [DefaultSemantic.Colors])
 
             let boundary = RenderObject.ofScope scope
+            boundary.RasterizerState.Multisample <- multisample
             boundary.RenderPass <- pass
             boundary.BlendState.Mode <- AVal.constant BlendMode.Blend
             boundary.VertexAttributes <- cache.VertexBuffers