Title: [220825] releases/WebKitGTK/webkit-2.18
- Revision
- 220825
- Author
- [email protected]
- Date
- 2017-08-16 23:08:34 -0700 (Wed, 16 Aug 2017)
Log Message
Merge r220699 - REGRESSION(r220517-r220521) [GTK] Various compositing tests fail
https://bugs.webkit.org/show_bug.cgi?id=175478
Reviewed by Sergio Villar Senin.
Source/WebCore:
Fix a regression introduced in r220519. Move a framebuffer binding in TextureMapperGL
away from GraphicsContext3D and onto the OpenGL API to work around the framebuffer
binding state that's kept in the GraphicsContext3D class. This mismatch in how the
framebuffer was bound was causing a couple of test failures in compositing tests.
No new tests -- regressed tests have their failure expectations removed.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGL::bindDefaultSurface): Don't use GraphicsContext3D for the
glBindFramebuffer() call. This would be done in subsequent patches that would move
TextureMapperGL off the GraphicsContext3D usage, but this specific use case clashes
with the framebuffer binding that's done in BitmapTextureGL and was causing test
failures.
LayoutTests:
* platform/gtk/TestExpectations: Remove failure and flakiness expectations.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog (220824 => 220825)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-08-17 06:08:25 UTC (rev 220824)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-08-17 06:08:34 UTC (rev 220825)
@@ -1,3 +1,12 @@
+2017-08-14 Zan Dobersek <[email protected]>
+
+ REGRESSION(r220517-r220521) [GTK] Various compositing tests fail
+ https://bugs.webkit.org/show_bug.cgi?id=175478
+
+ Reviewed by Sergio Villar Senin.
+
+ * platform/gtk/TestExpectations: Remove failure and flakiness expectations.
+
2017-08-14 Ms2ger <[email protected]>
GTK-focused gardening.
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (220824 => 220825)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-17 06:08:25 UTC (rev 220824)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-17 06:08:34 UTC (rev 220825)
@@ -1,3 +1,24 @@
+2017-08-14 Zan Dobersek <[email protected]>
+
+ REGRESSION(r220517-r220521) [GTK] Various compositing tests fail
+ https://bugs.webkit.org/show_bug.cgi?id=175478
+
+ Reviewed by Sergio Villar Senin.
+
+ Fix a regression introduced in r220519. Move a framebuffer binding in TextureMapperGL
+ away from GraphicsContext3D and onto the OpenGL API to work around the framebuffer
+ binding state that's kept in the GraphicsContext3D class. This mismatch in how the
+ framebuffer was bound was causing a couple of test failures in compositing tests.
+
+ No new tests -- regressed tests have their failure expectations removed.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGL::bindDefaultSurface): Don't use GraphicsContext3D for the
+ glBindFramebuffer() call. This would be done in subsequent patches that would move
+ TextureMapperGL off the GraphicsContext3D usage, but this specific use case clashes
+ with the framebuffer binding that's done in BitmapTextureGL and was causing test
+ failures.
+
2017-08-10 Zan Dobersek <[email protected]>
[TexMap] Drop GraphicsContext3D usage from BitmapTextureGL
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (220824 => 220825)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-08-17 06:08:25 UTC (rev 220824)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-08-17 06:08:34 UTC (rev 220825)
@@ -649,7 +649,7 @@
void TextureMapperGL::bindDefaultSurface()
{
- m_context3D->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, data().targetFrameBuffer);
+ glBindFramebuffer(GL_FRAMEBUFFER, data().targetFrameBuffer);
auto& viewport = data().viewport;
data().projectionMatrix = createProjectionMatrix(IntSize(viewport[2], viewport[3]), data().PaintFlags & PaintingMirrored);
m_context3D->viewport(viewport[0], viewport[1], viewport[2], viewport[3]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
