Mir

mir:bors-dont-delete

  1. Git
  2. lp:mir
  3. bors-dont-delete
Last commit made on 2019-12-12
Get this branch:
git clone -b bors-dont-delete https://git.launchpad.net/mir

Branch merges

Branch information

Name:
bors-dont-delete
Repository:
lp:mir

Recent commits

6c90caa... by Chris Halse Rogers

bors: Don't delete merged branches.

Once you delete the base branch of a PR in GitHub it cannot
be retargetted. So, if you have a series of stacked PRs
and bors merges the base branch, deleting that merged branch
means all dependent PRs need to be resubmitted, losing any
commentary.

If bors does *not* delete the merged branch then the PRs can
have their base branch changed to master as the parent gets
merged.

838745f... by "bors[bot]" <26634292+bors[bot]@users.noreply.github.com>

Merge #1137

1137: x11 tweaks r=wmww a=AlanGriffiths

Drop some code used in early testing.

Add a configuration option to specify the Xwayland executable.

Co-authored-by: Alan Griffiths <email address hidden>

3159419... by "bors[bot]" <26634292+bors[bot]@users.noreply.github.com>

Merge #1122

1122: Split mgc::ShmBuffer into a storageless-base class and memory-backed implementation r=AlanGriffiths a=RAOF

`mgc::ShmBuffer` is now a usable base for a `gl::Texture` supporting view on a CPU-mapped buffer.

`mgc::MemoryBackedShmBuffer` is a full implementation (including a `sw::PixelSource`) that backed by a self-allocated memory buffer. It drops the `mmap`ed file implementation, as this is only required to support deprecated mirclient APIs.

This is then usable as-is for platforms, so the existing platforms are switched over.

Co-authored-by: Christopher James Halse Rogers <email address hidden>

f462495... by Alan Griffiths

Make the path to the Xwayland executable configurable

6f36538... by Alan Griffiths

Strip out MIR_X11_LAZY - we are not using it and shouldn't need it.

e9b7ba1... by "bors[bot]" <26634292+bors[bot]@users.noreply.github.com>

Merge #1132

1132: Revert "Merge #1089" r=RAOF a=AlanGriffiths

We're no longer seeing intermittent failures to set up ubuntu-devel. Reinstate in CI.

This reverts commit a9a7bd592c7996d98ffd7d54d63f06deb6cd7fcd, reversing
changes made to 5fdc44755a982374b1723ee0308eb4e76920b9e0.

Co-authored-by: Alan Griffiths <email address hidden>

b9015eb... by Chris Halse Rogers

mesa-kms: Drop superfluous test.

We no longer need to test MirClient properties on ShmBuffers;
they no longer support those interfaces.

42fb185... by "bors[bot]" <26634292+bors[bot]@users.noreply.github.com>

Merge #1134

1134: [wayland-platform] Apply output scale r=wmww a=AlanGriffiths

Apply output scale. (Fixes: #1133)

Mir uses unscaled coordinates, so we need to mark buffers as pre-scaled and scale some input values.

Co-authored-by: Alan Griffiths <email address hidden>

018c5c2... by Alan Griffiths

Apply output scale

751590e... by Alan Griffiths

Revert "Merge #1089"

This reverts commit a9a7bd592c7996d98ffd7d54d63f06deb6cd7fcd, reversing
changes made to 5fdc44755a982374b1723ee0308eb4e76920b9e0.