← Back to branch summary

~robertcarr/mir/send-clients-input

« back to all changes in this revision

Viewing changes to include/mir/compositor/buffer_bundle.h

  • 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:
include/mir/compositor/buffer_bundle.h
21
21
#define MIR_COMPOSITOR_BUFFER_BUNDLE_H_
22
22
 
23
23
#include "mir/geometry/size.h"
24
 
#include "mir/compositor/pixel_format.h"
 
24
#include "mir/geometry/pixel_format.h"
25
25
 
26
26
#include <memory>
27
27
 
58
58
public:
59
59
    virtual std::shared_ptr<GraphicBufferClientResource> secure_client_buffer() = 0;
60
60
    virtual std::shared_ptr<graphics::Texture> lock_and_bind_back_buffer() = 0;
61
 
    virtual PixelFormat get_bundle_pixel_format() = 0;
 
61
    virtual geometry::PixelFormat get_bundle_pixel_format() = 0;
62
62
    virtual geometry::Size bundle_size() = 0;
63
63
};
64
64