Merge lp:~vanvugt/mir/fix-1657755 into lp:mir

[Daniel van Vugt]

Remove the workaround for LP: #1369763 to fix LP: #1657755

As discussed a while back [1], living with LP: #1369763 is probably
the lesser evil. But we should still strive to fix all the bugs.

Client-side vsync should tolerate this fine, as it still contains a
workaround to support running on top of server-side vsync. It's not
guaranteed always optimal latency while LP: #1369763 is unresolved but
will achieve it most of the time.

[1] https://code.launchpad.net/~kdub/mir/fix-1369763/+merge/307945/comments/797700

TODO: Needs device testing still.

Also note the regression test was broken. StubTransformedRenderable would never get overlaid since it is transformed.

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

PASSED: Continuous integration, rev:3964
https://mir-jenkins.ubuntu.com/job/mir-ci/2789/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3653
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3732
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3722
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3722
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3722
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3680
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3680/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/3680
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3680/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3680
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3680/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3680
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3680/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3680
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3680/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/3680
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3680/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/platforms/android/server/hwc_device.cpp'
--- src/platforms/android/server/hwc_device.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/android/server/hwc_device.cpp	2017-01-20 05:09:47 +0000
@@ -56,8 +56,7 @@
         //TODO: enable planeAlpha for (hwc version >= 1.2), 90 deg rotation
         static glm::mat4 const identity;
         if (plane_alpha_is_translucent(*renderable) ||
-           (renderable->transformation() != identity) ||
-           (renderable->swap_interval() == 0)) //See LP: #1369763
+            renderable->transformation() != identity)
         {
             return false;
         }

=== modified file 'tests/unit-tests/platforms/android/server/test_hwc_device.cpp'
--- tests/unit-tests/platforms/android/server/test_hwc_device.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/platforms/android/server/test_hwc_device.cpp	2017-01-20 05:09:47 +0000
@@ -24,6 +24,7 @@
 #include "src/platforms/android/server/hwc_configuration.h"
 #include "mir/test/doubles/mock_android_native_buffer.h"
 #include "mir/test/doubles/stub_renderable.h"
+#include "mir/test/doubles/mock_renderable.h"
 #include "mir/test/doubles/mock_framebuffer_bundle.h"
 #include "mir/test/doubles/stub_buffer.h"
 #include "mir/test/doubles/mock_hwc_device_wrapper.h"
@@ -599,16 +600,19 @@
     EXPECT_FALSE(device.compatible_renderlist(renderlist));
 }
 
-//LP: #1369763. We could get swapinterval 0 to work with overlays, but we'd need
-//the vsync signal from hwc to reach the client, so the client can rate-limit its submissions.
-// Update: We have client-side vsync now so it should be possible to do this...
-TEST_F(HwcDevice, rejects_list_containing_interval_0)
+// Regression test for LP: #1657755
+TEST_F(HwcDevice, accepts_list_containing_interval_0)
 {
+    using namespace ::testing;
+
     mga::HwcDevice device(mock_device);
-
-    auto renderable = std::make_shared<mtd::StubTransformedRenderable>();
+    auto renderable = std::make_shared<NiceMock<mtd::MockRenderable>>();
+
+    ON_CALL(*renderable, swap_interval())
+        .WillByDefault(Return(0));
+
     mg::RenderableList renderlist{renderable};
-    EXPECT_FALSE(device.compatible_renderlist(renderlist));
+    EXPECT_TRUE(device.compatible_renderlist(renderlist));
 }
 
 //TODO: we could accept a 90 degree transform