Merge lp:~vanvugt/mir/simplify-BufferDepository-submit into lp:mir

[Daniel van Vugt]

Remove dead code: Unused parameters to BufferDepository::submit()

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4160
https://mir-jenkins.ubuntu.com/job/mir-ci/3390/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4589
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4717
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4706
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4706
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4621
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4621/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4621
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4621/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4621
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4621/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4621
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4621/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4621
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4621/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3390/rebuild

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

lgtm

review: Approve

=== modified file 'src/client/buffer_stream.cpp'
--- src/client/buffer_stream.cpp	2017-04-13 07:00:27 +0000
+++ src/client/buffer_stream.cpp	2017-05-02 09:21:45 +0000
@@ -185,7 +185,7 @@
         return current->rpc_id();
     }
 
-    MirWaitHandle* submit(std::function<void()> const& done, MirPixelFormat, int)
+    MirWaitHandle* submit(std::function<void()> const& done)
     {
         std::unique_lock<std::mutex> lk(mutex);
         if (!current)
@@ -389,11 +389,8 @@
 
     secured_region.reset();
 
-    // TODO: We can fix the strange "ID casting" used below in the second phase
-    // of buffer stream which generalizes and clarifies the server side logic.
     lock.unlock();
-    return buffer_depository->submit(done,
-        static_cast<MirPixelFormat>(protobuf_bs->pixel_format()), protobuf_bs->id().value());
+    return buffer_depository->submit(done);
 }
 
 std::shared_ptr<mcl::ClientBuffer> mcl::BufferStream::get_current_buffer()