Mir

Merge lp://staging/~kdub/mir/fix-1663062-0.26.1 into lp://staging/~mir-team/mir/0.26-old

  1. fix-1663062-0.26.1
  2. Merge into 0.26-old
Proposed by Kevin DuBois
Status: Merged
Merged at revision: 4024
Proposed branch: lp://staging/~kdub/mir/fix-1663062-0.26.1
Merge into: lp://staging/~mir-team/mir/0.26-old
Diff against target: 116 lines (+17/-15)
5 files modified
src/server/graphics/nested/host_connection.h (+1/-1)
src/server/graphics/nested/mir_client_host_connection.cpp (+6/-6)
src/server/graphics/nested/mir_client_host_connection.h (+1/-1)
src/server/graphics/nested/platform.cpp (+8/-6)
tests/include/mir/test/doubles/stub_host_connection.h (+1/-1)
To merge this branch: bzr merge lp://staging/~kdub/mir/fix-1663062-0.26.1
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Approve
Review via email: mp+316891@code.staging.launchpad.net

Commit message

nested: disable passthrough on MirBuffers backed by ShmBuffer. Attempts to upload ShmBuffer via EGLImageTargetTexture2D doesn't work which was causing LP: #1663062. The ShmBuffer needs to be uploaded via TexImage2D, but more plumbing is needed in the nested platform to do that quickly. As a bonus, don't allocate a buffer to try to infer passthrough capabilities in the nested server.

Description of the change

nested: disable passthrough on MirBuffers backed by ShmBuffer. Attempts to upload ShmBuffer via EGLImageTargetTexture2D doesn't work which was causing LP: #1663062. The ShmBuffer needs to be uploaded via TexImage2D, but more plumbing is needed in the nested platform to do that quickly. As a bonus, don't allocate a buffer to try to infer passthrough capabilities in the nested server.

testing: mesa hardware, mesa software, android hardware, android software (passthrough candidates)

To post a comment you must log in.
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

LGTM. Pleased that Android retains passthrough for both.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches