Title: [279330] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 279330
- Author
- [email protected]
- Date
- 2021-06-28 04:49:48 -0700 (Mon, 28 Jun 2021)
Log Message
Merge r277999 - GLContextEGL::swapBuffers() shouldn't do anything for Surfaceless contexts
https://bugs.webkit.org/show_bug.cgi?id=226164
Patch by Zan Dobersek <[email protected]> on 2021-05-24
Reviewed by Philippe Normand.
In case of a surfaceless GLContextEGL, the swapBuffers() method should
return early, avoiding an assert expecting a non-null EGLSurface (not
viable for surfaceless context) and a call to eglSwapBuffers(), which
on some drivers could still fail even when the surfaceless context
support is present and active.
* platform/graphics/egl/GLContextEGL.cpp:
(WebCore::GLContextEGL::swapBuffers):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (279329 => 279330)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-06-28 11:49:41 UTC (rev 279329)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-06-28 11:49:48 UTC (rev 279330)
@@ -1,3 +1,19 @@
+2021-05-24 Zan Dobersek <[email protected]>
+
+ GLContextEGL::swapBuffers() shouldn't do anything for Surfaceless contexts
+ https://bugs.webkit.org/show_bug.cgi?id=226164
+
+ Reviewed by Philippe Normand.
+
+ In case of a surfaceless GLContextEGL, the swapBuffers() method should
+ return early, avoiding an assert expecting a non-null EGLSurface (not
+ viable for surfaceless context) and a call to eglSwapBuffers(), which
+ on some drivers could still fail even when the surfaceless context
+ support is present and active.
+
+ * platform/graphics/egl/GLContextEGL.cpp:
+ (WebCore::GLContextEGL::swapBuffers):
+
2021-05-07 Chris Dumez <[email protected]>
AudioWorkletProcessor which does not extend base class crashes Safari
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (279329 => 279330)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2021-06-28 11:49:41 UTC (rev 279329)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2021-06-28 11:49:48 UTC (rev 279330)
@@ -476,6 +476,9 @@
void GLContextEGL::swapBuffers()
{
+ if (m_type == Surfaceless)
+ return;
+
ASSERT(m_surface);
eglSwapBuffers(m_display.eglDisplay(), m_surface);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
