Merge pull request #9408 from AvaloniaUI/surface

Dan Walmsley · web-flow · commit 4dd319c51636 · 2022-11-10T16:35:21.000Z
Do not create an egl surface if the window provided is invalid
diff --git a/src/Avalonia.OpenGL/Egl/EglPlatformOpenGlInterface.cs b/src/Avalonia.OpenGL/Egl/EglPlatformOpenGlInterface.cs
@@ -44,10 +44,13 @@ public static EglPlatformOpenGlInterface TryCreate(Func<EglDisplay> displayFacto
 
         public IGlContext CreateContext() => Display.CreateContext(null);
         public IGlContext CreateSharedContext() => Display.CreateContext(PrimaryEglContext);
-        
+
 
         public EglSurface CreateWindowSurface(IntPtr window)
         {
+            if (window == IntPtr.Zero)
+                throw new OpenGlException($"Window {window} is invalid.");
+
             using (PrimaryContext.MakeCurrent())
             {
                 var s = Display.EglInterface.CreateWindowSurface(Display.Handle, Display.Config, window,

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,13 @@ public static EglPlatformOpenGlInterface TryCreate(Func<EglDisplay> displayFacto`
`44`	`44`
`45`	`45`	`public IGlContext CreateContext() => Display.CreateContext(null);`
`46`	`46`	`public IGlContext CreateSharedContext() => Display.CreateContext(PrimaryEglContext);`
`47`		`-`
	`47`	`+`
`48`	`48`
`49`	`49`	`public EglSurface CreateWindowSurface(IntPtr window)`
`50`	`50`	`{`
	`51`	`+ if (window == IntPtr.Zero)`
	`52`	`+ throw new OpenGlException($"Window {window} is invalid.");`
	`53`	`+`
`51`	`54`	`using (PrimaryContext.MakeCurrent())`
`52`	`55`	`{`
`53`	`56`	`var s = Display.EglInterface.CreateWindowSurface(Display.Handle, Display.Config, window,`