← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to src/client/android/client_surface_interpreter.cpp

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/android/client_surface_interpreter.cpp
29
29
{
30
30
}
31
31
 
32
 
ANativeWindowBuffer* mcla::ClientSurfaceInterpreter::driver_requests_buffer()
 
32
MirNativeBuffer* mcla::ClientSurfaceInterpreter::driver_requests_buffer()
33
33
{
34
34
    auto buffer = surface.get_current_buffer();
35
 
    auto buffer_to_driver = buffer->get_native_handle();
 
35
    auto buffer_to_driver = buffer->native_buffer_handle();
36
36
    buffer_to_driver->format = driver_pixel_format;
37
37
 
38
 
    return buffer_to_driver;
 
38
    return buffer_to_driver.get();
39
39
}
40
40
 
41
41
static void empty(MirSurface * /*surface*/, void * /*client_context*/)
42
42
{}
43
 
void mcla::ClientSurfaceInterpreter::driver_returns_buffer(ANativeWindowBuffer*, std::shared_ptr<mga::SyncObject> const& sync_fence)
 
43
void mcla::ClientSurfaceInterpreter::driver_returns_buffer(MirNativeBuffer*, std::shared_ptr<mga::SyncObject> const& sync_fence)
44
44
{
45
45
    sync_fence->wait();
46
46
    mir_wait_for(surface.next_buffer(empty, NULL));