← Back to branch summary

~alan-griffiths/mir/workaround-lp1602199

« back to all changes in this revision

Viewing changes to src/server/compositor/buffer_map.cpp

  • Committer: Tarmac
  • Author(s): Kevin DuBois
  • Date: 2016-05-03 09:49:54 UTC
  • mfrom: (3369.2.31 server-side-alloc)
  • Revision ID: tarmac-20160503094954-6l9jtr20mydxs3l7
server: Change point of frontend-facing buffer allocation from the mf::BufferStream to the msc::Session to prepare for NBS connection-allocated buffers.

We were previously allocating from the streams, but to accommodate mir_connection_allocate_buffer(), we will have to allocate via msc::Session.

This exposes mf::ClientBuffers(), as the streams need to reflect that buffers came from the same Session/connection. (cross-connection/cross-process mirclient-allocated-buffers are not supported). render_surfaces has an example of a 'floating' shell buffer stream that didn't originate from IPC.

Approved by mir-ci-bot, Cemil Azizoglu, Chris Halse Rogers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/compositor/buffer_map.cpp
39
39
}
40
40
 
41
41
mc::BufferMap::BufferMap(
42
 
    mf::BufferStreamId id,
43
42
    std::shared_ptr<mf::BufferSink> const& sink,
44
43
    std::shared_ptr<mg::GraphicBufferAllocator> const& allocator) :
45
 
    stream_id(id),
46
44
    sink(sink),
47
45
    allocator(allocator)
48
46
{