From f921998e35114591aacf060002ff40bbbbe0e0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDan=20Dober=C5=A1ek?= Date: Thu, 17 Aug 2017 06:08:34 +0000 Subject: [PATCH] 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. --- LayoutTests/ChangeLog | 9 ++++++++ Source/WebCore/ChangeLog | 21 +++++++++++++++++++ .../graphics/texmap/TextureMapperGL.cpp | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 5b37b386dbb3..d29848df0706 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,12 @@ +2017-08-14 Zan Dobersek + + 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 GTK-focused gardening. diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 1ce4a3649afb..15d0a3c33f10 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,24 @@ +2017-08-14 Zan Dobersek + + 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 [TexMap] Drop GraphicsContext3D usage from BitmapTextureGL diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp index 3366709193ae..39bea27b50f7 100644 --- a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp +++ b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp @@ -649,7 +649,7 @@ TextureMapperGL::~TextureMapperGL() 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]);