[Text] Use FramebufferLayout as surface cache key

aardvark-platform · Aug 6, 2024 · 92da4f3 · 92da4f3
1 parent 6adc5ff
commit 92da4f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/Aardvark.Rendering.GL/Runtime/Runtime.fs b/src/Aardvark.Rendering.GL/Runtime/Runtime.fs
@@ -385,11 +385,7 @@ type Runtime(debug : IDebugConfig) =
     member x.PrepareBuffer (b : IBuffer, [<Optional; DefaultParameterValue(BufferStorage.Device)>] storage : BufferStorage) = ctx.CreateBuffer(b, storage)
     member x.PrepareEffect (signature : IFramebufferSignature, effect : FShade.Effect, topology : IndexedGeometryMode) : IBackendSurface =
         Operators.using ctx.ResourceLock (fun d ->
-            if signature.LayerCount > 1 then
-                Log.warn("[PrepareSurface] Using Triangle topology.")
-
             let _, program = ctx.CreateProgram(signature, Surface.Effect effect, topology)
-
             AVal.force program :> IBackendSurface
         )
 

diff --git a/src/Aardvark.Rendering.Text/Font.fs b/src/Aardvark.Rendering.Text/Font.fs
@@ -100,9 +100,9 @@ type ShapeCache(r : IRuntime) =
     let ranges = ConcurrentDictionary<Shape, Range1i>()
 
 
-    let surfaceCache = ConcurrentDictionary<IFramebufferSignature, Lazy<IBackendSurface>>()
-    let boundarySurfaceCache = ConcurrentDictionary<IFramebufferSignature, Lazy<IBackendSurface>>()
-    let billboardSurfaceCache = ConcurrentDictionary<IFramebufferSignature, Lazy<IBackendSurface>>()
+    let surfaceCache = ConcurrentDictionary<FramebufferLayout, Lazy<IBackendSurface>>()
+    let boundarySurfaceCache = ConcurrentDictionary<FramebufferLayout, Lazy<IBackendSurface>>()
+    let billboardSurfaceCache = ConcurrentDictionary<FramebufferLayout, Lazy<IBackendSurface>>()
 
 
     let pathShader =
@@ -154,7 +154,7 @@ type ShapeCache(r : IRuntime) =
         ]
 
     let surface (s : IFramebufferSignature) =
-        surfaceCache.GetOrAdd(s, fun s ->
+        surfaceCache.GetOrAdd(s.Layout, fun _ ->
             lazy (
                 r.PrepareEffect(
                     s, [
@@ -166,7 +166,7 @@ type ShapeCache(r : IRuntime) =
         ).Value
 
     let boundarySurface (s : IFramebufferSignature) =
-        boundarySurfaceCache.GetOrAdd(s, fun s ->
+        boundarySurfaceCache.GetOrAdd(s.Layout, fun _ ->
             lazy (
                 r.PrepareEffect(
                     s, [
@@ -178,7 +178,7 @@ type ShapeCache(r : IRuntime) =
         ).Value
 
     let billboardSurface (s : IFramebufferSignature) =
-        billboardSurfaceCache.GetOrAdd(s, fun s ->
+        billboardSurfaceCache.GetOrAdd(s.Layout, fun _ ->
             lazy (
                 r.PrepareEffect(
                     s, [