Skip to content

Revert "Linux reuse sibling (#183653)"#183871

Merged
robert-ancell merged 1 commit intoflutter:masterfrom
robert-ancell:linux-revert-sibling
Mar 19, 2026
Merged

Revert "Linux reuse sibling (#183653)"#183871
robert-ancell merged 1 commit intoflutter:masterfrom
robert-ancell:linux-revert-sibling

Conversation

@robert-ancell
Copy link
Contributor

This reverts commit ed5bda4.

When running the examples/multiple_windows and creating a regular window then closing it causes the content of the main window to stop being updated. The terminal shows:

GrGLGpu::flushRenderTargetNoColorWrites glCheckFramebufferStatus 8cd7
---- glGetError 0x506(Unknown) at
        ../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGpu.cpp(2271) :
                Clear(clearMask)
---- glGetError 0x506(Unknown) at
        ../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp(225) :
                DrawRangeElements(glPrimType, minIndexValue, maxIndexValue, indexCount, 0x1403, this->offsetForBaseIndex(baseIndex))
---- glGetError 0x506(Unknown) at
        ../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp(216) :
                DrawElementsInstancedBaseVertexBaseInstance( glPrimType, indexCount, 0x1403, this->offsetForBaseIndex(baseIndex), 1, baseVertex, 0)
---- glGetError 0x506(Unknown) at
        ../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp(216) :
                DrawElementsInstancedBaseVertexBaseInstance( glPrimType, indexCount, 0x1403, this->offsetForBaseIndex(baseIndex), 1, baseVertex, 0)
---- glGetError 0x506(Unknown) at
        ../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp(216) :
                DrawElementsInstancedBaseVertexBaseInstance( glPrimType, indexCount, 0x1403, this->offsetForBaseIndex(baseIndex), 1, baseVertex, 0)
---- glGetError 0x506(Unknown) at
        ../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp(203) :
                DrawArrays(glPrimType, baseVertex, vertexCount)
---- glGetError 0x506(Unknown) at
        ../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp(216) :
                DrawElementsInstancedBaseVertexBaseInstance( glPrimType, indexCount, 0x1403, this->offsetForBaseIndex(baseIndex), 1, baseVertex, 0)
---- glGetError 0x506(Unknown) at
        ../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp(216) :
                DrawElementsInstancedBaseVertexBaseInstance( glPrimType, indexCount, 0x1403, this->offsetForBaseIndex(baseIndex), 1, baseVertex, 0)
---- glGetError 0x506(Unknown) at
        ../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTexture.cpp(192) :
                ObjectLabel(0x1702, fID, -1, label.c_str())

@robert-ancell robert-ancell requested a review from a team as a code owner March 19, 2026 02:27
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@github-actions github-actions bot added engine flutter/engine related. See also e: labels. platform-linux Building on or for Linux specifically a: desktop Running on desktop team-linux Owned by the Linux platform team labels Mar 19, 2026
@robert-ancell robert-ancell added the CICD Run CI/CD label Mar 19, 2026
@robert-ancell robert-ancell mentioned this pull request Mar 19, 2026
10 tasks
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request reverts changes made to engine/src/flutter/shell/platform/linux/fl_compositor_opengl.cc. The changes remove the render_sibling member from the _FlCompositorOpenGL struct, revert the order of operations for framebuffer recreation upon resize, and handle the sibling framebuffer within the render function using a local variable rather than a class member. These changes effectively undo a previous commit to resolve a regression.

@richardexfo
Copy link
Contributor

@robert-ancell I apologize for breaking that. I'll try to reproduce locally the issue and fix it. May I reach out to you for some help in reproducing the issue if I get stuck?

@robert-ancell robert-ancell added this pull request to the merge queue Mar 19, 2026
@robert-ancell
Copy link
Contributor Author

@richardexfo no problem - I suggest you make a new PR set to draft with this change and we can discuss there if you are unable to reproduce.

Merged via the queue into flutter:master with commit 685f469 Mar 19, 2026
186 checks passed
@robert-ancell robert-ancell deleted the linux-revert-sibling branch March 19, 2026 21:01
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 20, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 20, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 20, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 20, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: desktop Running on desktop CICD Run CI/CD engine flutter/engine related. See also e: labels. platform-linux Building on or for Linux specifically team-linux Owned by the Linux platform team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants