Propagate exceptions from compositor to unit/render tests

src/Avalonia.Base/Media/MediaContext.Compositor.cs

@@ -91,7 +91,7 @@ private bool CommitCompositorsWithThrottling()
     /// Executes a synchronous commit when we need to wait for composition jobs to be done
     /// Is used in resize and TopLevel destruction scenarios
     /// </summary>
-    private void SyncCommit(Compositor compositor, bool waitFullRender)
+    private void SyncCommit(Compositor compositor, bool waitFullRender, bool catchExceptions)
     {
         // Unit tests are assuming that they can call any API without setting up platforms
         if (AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() == null)
@@ -109,7 +109,7 @@ private void SyncCommit(Compositor compositor, bool waitFullRender)
         else
         {
             CommitCompositor(compositor);
-            compositor.Server.Render();
+            compositor.Server.Render(catchExceptions);
         }
     }
 
@@ -118,9 +118,9 @@ private void SyncCommit(Compositor compositor, bool waitFullRender)
     /// </summary>
     // TODO: do we need to execute a render pass here too?
     // We've previously tried that and it made the resize experience worse
-    public void ImmediateRenderRequested(CompositionTarget target)
+    public void ImmediateRenderRequested(CompositionTarget target, bool catchExceptions)
     {
-        SyncCommit(target.Compositor, true);
+        SyncCommit(target.Compositor, true, catchExceptions);
     }
 
 
@@ -133,7 +133,7 @@ public void SyncDisposeCompositionTarget(CompositionTarget compositionTarget)
         compositionTarget.Dispose();
 
         // TODO: introduce a way to skip any actual rendering for other targets and only do a dispose?
-        SyncCommit(compositionTarget.Compositor, false);
+        SyncCommit(compositionTarget.Compositor, false, true);
     }
 
     /// <summary>

src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs

@@ -211,14 +211,15 @@ public void Resized(Size size)
     }
 
     /// <inheritdoc />
-    public void Paint(Rect rect)
+    public void Paint(Rect rect) => Paint(rect, true);
+    public void Paint(Rect rect, bool catchExceptions)
     {
         if (_isDisposed)
             return;
 
         QueueUpdate();
         CompositionTarget.RequestRedraw();
-        MediaContext.Instance.ImmediateRenderRequested(CompositionTarget);
+        MediaContext.Instance.ImmediateRenderRequested(CompositionTarget, catchExceptions);
     }
 
     /// <inheritdoc />

src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs

@@ -157,7 +157,8 @@ void NotifyBatchesRendered()
             _reusableToNotifyRenderedList.Clear();
         }
 
-        public void Render()
+        public void Render() => Render(true);
+        public void Render(bool catchExceptions)
         {
             if (Dispatcher.UIThread.CheckAccess())
             {
@@ -167,18 +168,18 @@ public void Render()
                 try
                 {
                     using (Dispatcher.UIThread.DisableProcessing()) 
-                        RenderReentrancySafe();
+                        RenderReentrancySafe(catchExceptions);
                 }
                 finally
                 {
                     _uiThreadIsInsideRender = false;
                 }
             }
             else
-                RenderReentrancySafe();
+                RenderReentrancySafe(catchExceptions);
         }
 
-        private void RenderReentrancySafe()
+        private void RenderReentrancySafe(bool catchExceptions)
         {
             lock (_lock)
             {
@@ -187,11 +188,7 @@ private void RenderReentrancySafe()
                     try
                     {
                         _safeThread = Thread.CurrentThread;
-                        RenderCore();
-                    }
-                    catch (Exception e) when (RT_OnContextLostExceptionFilterObserver(e) && false)
-                    // Will never get here, only using exception filter side effect
-                    {
+                        RenderCore(catchExceptions);
                     }
                     finally
                     {
@@ -205,7 +202,7 @@ private void RenderReentrancySafe()
             }
         }
 
-        private void RenderCore()
+        private void RenderCore(bool catchExceptions)
         {
             UpdateServerTime();
             ApplyPendingBatches();
@@ -228,7 +225,7 @@ private void RenderCore()
                 foreach (var t in _activeTargets)
                     t.Render();
             }
-            catch (Exception e)
+            catch (Exception e) when(RT_OnContextLostExceptionFilterObserver(e) && catchExceptions)
             {
                 Logger.TryGet(LogEventLevel.Error, LogArea.Visual)?.Log(this, "Exception when rendering: {Error}", e);
             }

src/Browser/Avalonia.Browser/AvaloniaView.cs

@@ -454,7 +454,7 @@ private void ForceBlit()
 
             if (_topLevel.Renderer is CompositingRenderer dr)
             {
-                MediaContext.Instance.ImmediateRenderRequested(dr.CompositionTarget);
+                MediaContext.Instance.ImmediateRenderRequested(dr.CompositionTarget, true);
             }
         }
 

tests/Avalonia.Base.UnitTests/Media/RenderResourceTestHelper.cs

@@ -42,7 +42,7 @@ public void AssertInvalidation<T>(T resource, Action cb)
         Assert.True(Compositor.UnitTestIsRegisteredForSerialization(resource));
 
         Compositor.Commit();
-        Compositor.Server.Render();
+        Compositor.Server.Render(false);
 
         Assert.False(Compositor.UnitTestIsRegisteredForSerialization(resource));
         cb();
@@ -52,4 +52,4 @@ public void AssertInvalidation<T>(T resource, Action cb)
     }
 
     public void Dispose() => Services.Dispose();
-}
+}

tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs

@@ -31,7 +31,7 @@ public TestContext(CompositorTestServices services)
             public void ForceRender()
             {
                 _compositor.Commit();
-                _compositor.Server.Render();
+                _compositor.Server.Render(false);
             }
 
             public Rect? GetBounds()

tests/Avalonia.RenderTests/TestBase.cs

@@ -120,7 +120,7 @@ protected Task RenderToFile(Control target, [CallerMemberName] string testName =
                     root.Initialize(renderer, target);
                     renderer.Start();
                     Dispatcher.UIThread.RunJobs();
-                    timer.TriggerTick();
+                    renderer.Paint(new Rect(root.Bounds.Size), false);
                 }
                 writableBitmap.Save(compositedPath);
             }