← Back to branch summary

~dandrader/mir/cross-compile-parallel

« back to all changes in this revision

Viewing changes to src/server/graphics/gbm/gbm_buffer_allocator.cpp

  • Committer: Daniel van Vugt
  • Date: 2013-08-28 03:41:48 UTC
  • mfrom: (1026 trunk)
  • mto: This revision was merged to the branch mainline in revision 1040.
  • Revision ID: daniel.van.vugt@canonical.com-20130828034148-3rie198rwv3qmnhz
Merge latest lp:mir

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/graphics/gbm/gbm_buffer_allocator.cpp
107
107
}
108
108
 
109
109
mgg::GBMBufferAllocator::GBMBufferAllocator(
110
 
        const std::shared_ptr<GBMPlatform>& platform,
 
110
        gbm_device* device,
111
111
        const std::shared_ptr<BufferInitializer>& buffer_initializer)
112
 
        : platform(platform),
 
112
        : device(device),
113
113
          buffer_initializer(buffer_initializer),
114
114
          egl_extensions(std::make_shared<mg::EGLExtensions>())
115
115
{
153
153
    }
154
154
 
155
155
    gbm_bo *bo_raw = gbm_bo_create(
156
 
        platform->gbm.device,
 
156
        device,
157
157
        buffer_properties.size.width.as_uint32_t(),
158
158
        buffer_properties.size.height.as_uint32_t(),
159
159
        gbm_format,