← Back to branch summary

~robertcarr/mir/send-clients-input

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp

  • Committer: Alan Griffiths
  • Date: 2012-09-25 09:01:03 UTC
  • mfrom: (134.9.91 android-client-buffer)
  • Revision ID: alan@octopull.co.uk-20120925090103-sgzbgx01lzfpaua1
client: android client buffer

This reconciles lp:~kdub/mir/android-client-buffer/ with the changes that have happened on trunk today.

a few points moved PixelFormat into geometry from compositor, and use mir/geometry on the client side as well. The concepts of dimensions and pixelformats are useful on the client and server side. (caused a bit of code churn)

this mp does not connect MirMemoryRegion into mir::client::MemoryRegion. (future mp)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp
47
47
        allocator.reset(new mgg::GBMBufferAllocator(platform));
48
48
 
49
49
        size = geom::Size{geom::Width{300}, geom::Height{200}};
50
 
        pf = mc::PixelFormat::rgba_8888;
 
50
        pf = geom::PixelFormat::rgba_8888;
51
51
 
52
52
        ON_CALL(mock_gbm, gbm_bo_get_width(_))
53
53
        .WillByDefault(Return(size.width.as_uint32_t()));
67
67
    std::unique_ptr<mgg::GBMBufferAllocator> allocator;
68
68
 
69
69
    // Defaults
70
 
    mc::PixelFormat pf;
 
70
    geom::PixelFormat pf;
71
71
    geom::Size size;
72
72
};
73
73