← Back to branch summary

~alan-griffiths/mir/workaround-lp1602199

« back to all changes in this revision

Viewing changes to tests/integration-tests/test_session.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:
tests/integration-tests/test_session.cpp
100
100
struct StubGLBufferStreamFactory : public mtd::StubBufferStreamFactory
101
101
{
102
102
    std::shared_ptr<mc::BufferStream> create_buffer_stream(
103
 
        mf::BufferStreamId, std::shared_ptr<mf::BufferSink> const&,
 
103
        mf::BufferStreamId, std::shared_ptr<mf::ClientBuffers> const&,
104
104
        mg::BufferProperties const&) override
105
105
    {
106
106
        return std::make_shared<StubGLBufferStream>();
124
124
        conf.the_snapshot_strategy(),
125
125
        std::make_shared<ms::NullSessionListener>(),
126
126
        mtd::StubDisplayConfig{},
127
 
        std::make_shared<mtd::NullEventSink>()
 
127
        std::make_shared<mtd::NullEventSink>(),
 
128
        conf.the_buffer_allocator()
128
129
    };
129
130
 
130
131
    mg::BufferProperties properties(geom::Size{1,1}, mir_pixel_format_abgr_8888, mg::BufferUsage::software);