From 6adb1d062475ec8679ef01048bba24902c2c95b8 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 26 Jun 2020 12:51:37 -0300
Subject: [PATCH] pass in wrapped surface to session.

---
 src/Windows/Avalonia.Win32/Composition/CompositionHost.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/Composition/CompositionHost.cs b/src/Windows/Avalonia.Win32/Composition/CompositionHost.cs
index 5f20d18faf..02291d93ed 100644
--- a/src/Windows/Avalonia.Win32/Composition/CompositionHost.cs
+++ b/src/Windows/Avalonia.Win32/Composition/CompositionHost.cs
@@ -69,7 +69,7 @@ namespace Avalonia.Win32
 
                 var restoreContext = _context.MakeCurrent(surface);
 
-                return new Session(_display, _context, null, _info, l, restoreContext, () => { }, true);
+                return new Session(_display, _context, surface, _info, l, restoreContext, () => { }, true);
             }
 
             public override void Dispose()
@@ -108,7 +108,7 @@ namespace Avalonia.Win32
             {
                 _context.GlInterface.Flush();
                 _display.EglInterface.WaitGL();
-                _glSurface?.SwapBuffers();
+                _glSurface.SwapBuffers();
                 _display.EglInterface.WaitClient();
                 _display.EglInterface.WaitGL();
                 _display.EglInterface.WaitNative(EglConsts.EGL_CORE_NATIVE_ENGINE);