Merge lp:~kdub/mir/0.17.1-fix-1406725 into lp:mir/0.17

[Kevin DuBois]

just testing/demo for lp: #1406725. don't land

just testing/demo for lp: #1406725. don't land

[lp:~kdub/mir/0.17.1-fix-1406725]

3024. By Kevin DuBois on 2015-11-17

dont let xmir trash our cache to query size

3025. By Kevin DuBois on 2015-11-17

merge base

3026. By Kevin DuBois on 2015-11-17

bump version

Unmerged revisions

3026. By Kevin DuBois on 2015-11-17

bump version

3025. By Kevin DuBois on 2015-11-17

merge base

3024. By Kevin DuBois on 2015-11-17

dont let xmir trash our cache to query size

3023. By Kevin DuBois on 2015-11-13

add a warty quick fix for egl sync fence extensions

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-05 15:49:46 +0000
+++ debian/changelog	2015-11-17 16:35:23 +0000
@@ -1,5 +1,6 @@
-mir (0.17.1) UNRELEASED; urgency=medium
+mir (0.17.2ubuntu2) UNRELEASED; urgency=medium
 
+  [ Alberto Aguirre ]
   * New upstream release 0.17.1 (https://launchpad.net/mir/+milestone/0.17.1)
     - No ABI changes. Bug fix release only.
     - Bugs fixed:
@@ -16,7 +17,11 @@
       . [regression] mir-client-platform-mesa-dev pkg-config file dropped
         (LP: #1509005)
 
- -- Alberto Aguirre <[e-mail]>  Wed, 04 Nov 2015 15:08:54 -0600
+  [ kdub ]
+  * correct graphic corruption due to not having EGLSync fences
+  * correct xmir from trashing the android caches whenever it queries size on android
+
+ -- Kevin DuBois <[e-mail]>  Tue, 17 Nov 2015 11:33:20 -0500
 
 mir (0.17.0+15.10.20151008.2-0ubuntu1) wily; urgency=medium
 
 
=== modified file 'include/renderers/gl/mir/renderer/gl/texture_source.h'
--- include/renderers/gl/mir/renderer/gl/texture_source.h	2015-09-15 17:13:45 +0000
+++ include/renderers/gl/mir/renderer/gl/texture_source.h	2015-11-17 16:35:23 +0000
@@ -32,6 +32,7 @@
     virtual ~TextureSource() = default;
 
     virtual void gl_bind_to_texture() = 0;
+    virtual void gl_rebind_to_texture() {};
 
 protected:
     TextureSource() = default;
 
=== modified file 'src/client/buffer_stream.cpp'
--- src/client/buffer_stream.cpp	2015-09-24 15:42:21 +0000
+++ src/client/buffer_stream.cpp	2015-11-17 16:35:23 +0000
@@ -510,13 +510,14 @@
 void mcl::BufferStream::release_cpu_region()
 {
     secured_region.reset();
+    secured_region = nullptr;
 }
 
 std::shared_ptr<mcl::MemoryRegion> mcl::BufferStream::secure_for_cpu_write()
 {
     std::unique_lock<decltype(mutex)> lock(mutex);
-
-    secured_region = buffer_depository->current_buffer()->secure_for_cpu_write();
+    if (!secured_region)
+        secured_region = buffer_depository->current_buffer()->secure_for_cpu_write();
     return secured_region;
 }
 
 
=== modified file 'src/common/CMakeLists.txt'
--- src/common/CMakeLists.txt	2015-08-19 02:03:51 +0000
+++ src/common/CMakeLists.txt	2015-11-17 16:35:23 +0000
@@ -43,6 +43,7 @@
 
 target_link_libraries(mircommon
   ${MIR_COMMON_REFERENCES}
+  ${EGL_LIBRARIES}
 )
 
 # TODO we need a place to manage ABI and related versioning but use this as placeholder
 
=== modified file 'src/common/graphics/android/android_native_buffer.cpp'
--- src/common/graphics/android/android_native_buffer.cpp	2015-06-17 05:20:42 +0000
+++ src/common/graphics/android/android_native_buffer.cpp	2015-11-17 16:35:23 +0000
@@ -58,3 +58,49 @@
 {
     return fence->copy_native_handle();
 }
+
+void mga::AndroidNativeBuffer::EGLFence::clear_fence()
+{
+    if (!sync_extensions) return;
+    if (cmdfence != EGL_NO_SYNC_KHR)
+    {
+        wait_fence(disp, cmdfence, 0, 1500000000); //1500ms
+        destroy_fence(disp, cmdfence);
+        cmdfence = EGL_NO_SYNC_KHR;
+    }
+}
+
+void mga::AndroidNativeBuffer::EGLFence::raise_fence()
+{
+    if (!sync_extensions) return;
+    clear_fence();
+    disp = eglGetCurrentDisplay();
+    cmdfence = create_fence(disp, EGL_SYNC_FENCE_KHR, NULL);
+}
+
+mga::AndroidNativeBuffer::EGLFence::EGLFence() :
+    create_fence(reinterpret_cast<PFNEGLCREATESYNCKHRPROC>(eglGetProcAddress("eglCreateSyncKHR"))),
+    destroy_fence(reinterpret_cast<PFNEGLDESTROYSYNCKHRPROC>(eglGetProcAddress("eglDestroySyncKHR"))),
+    wait_fence(reinterpret_cast<PFNEGLCLIENTWAITSYNCKHRPROC>(eglGetProcAddress("eglClientWaitSyncKHR"))),
+    sync_extensions(create_fence && destroy_fence && wait_fence)
+{
+}
+
+mga::AndroidNativeBuffer::EGLFence::~EGLFence()
+{
+    if (!sync_extensions) return;
+    if (cmdfence != EGL_NO_SYNC_KHR)
+        destroy_fence(disp, cmdfence);
+}
+
+void mga::AndroidNativeBuffer::insert_cmdfence()
+{
+    std::unique_lock<std::mutex> lk(mutex);
+    cmdfence.raise_fence();
+}
+
+void mga::AndroidNativeBuffer::clear_cmdfence()
+{
+    std::unique_lock<std::mutex> lk(mutex);
+    cmdfence.clear_fence();
+}
 
=== modified file 'src/gl/recently_used_cache.cpp'
--- src/gl/recently_used_cache.cpp	2015-10-06 02:30:52 +0000
+++ src/gl/recently_used_cache.cpp	2015-11-17 16:35:23 +0000
@@ -47,6 +47,15 @@
         texture.resource = buffer;
         texture.last_bound_buffer = buffer_id;
     }
+    else
+    {
+        auto const texture_source =
+            dynamic_cast<mir::renderer::gl::TextureSource*>(
+                    buffer->native_buffer_base());
+        if (!texture_source)
+            BOOST_THROW_EXCEPTION(std::logic_error("Buffer does not support GL rendering"));
+        texture_source->gl_rebind_to_texture();
+    }
     texture.valid_binding = true;
     texture.used = true;
 
 
=== modified file 'src/include/common/mir/graphics/android/android_native_buffer.h'
--- src/include/common/mir/graphics/android/android_native_buffer.h	2015-06-17 05:20:42 +0000
+++ src/include/common/mir/graphics/android/android_native_buffer.h	2015-11-17 16:35:23 +0000
@@ -19,6 +19,9 @@
 #ifndef MIR_GRAPHICS_ANDROID_ANDROID_NATIVE_BUFFER_H_
 #define MIR_GRAPHICS_ANDROID_ANDROID_NATIVE_BUFFER_H_
 
+#define EGL_EGLEXT_PROTOTYPES
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 #include "native_buffer.h"
 #include <memory>
 #include <mutex>
@@ -45,10 +48,32 @@
     void ensure_available_for(BufferAccess);
     void update_usage(NativeFence& merge_fd, BufferAccess);
 
+    void insert_cmdfence();
+    void clear_cmdfence();
 private:
+
+    //Native fence infrastructure
     std::shared_ptr<Fence> fence;
     BufferAccess access;
     std::shared_ptr<ANativeWindowBuffer> native_window_buffer;
+
+    //EGL fence infrastructure
+    std::mutex mutex;
+    struct EGLFence
+    {
+        EGLFence();
+        ~EGLFence();
+        void clear_fence();
+        void raise_fence();
+    private:
+        EGLDisplay disp{EGL_NO_DISPLAY};
+        EGLSyncKHR cmdfence{EGL_NO_SYNC_KHR};
+        PFNEGLCREATESYNCKHRPROC const create_fence;
+        PFNEGLDESTROYSYNCKHRPROC const destroy_fence;
+        PFNEGLCLIENTWAITSYNCKHRPROC const wait_fence;
+        bool const sync_extensions;
+    } cmdfence;
+
 };
 
 struct RefCountedNativeBuffer : public ANativeWindowBuffer
 
=== modified file 'src/include/common/mir/graphics/android/native_buffer.h'
--- src/include/common/mir/graphics/android/native_buffer.h	2015-06-17 05:20:42 +0000
+++ src/include/common/mir/graphics/android/native_buffer.h	2015-11-17 16:35:23 +0000
@@ -53,6 +53,9 @@
     virtual void ensure_available_for(android::BufferAccess intent) = 0;
     virtual void update_usage(android::NativeFence& fence, android::BufferAccess current_usage) = 0;
 
+    virtual void insert_cmdfence() = 0;
+    virtual void clear_cmdfence() = 0;
+
 protected:
     NativeBuffer() = default;
     NativeBuffer(NativeBuffer const&) = delete;
 
=== modified file 'src/platforms/android/server/buffer.cpp'
--- src/platforms/android/server/buffer.cpp	2015-08-27 13:41:02 +0000
+++ src/platforms/android/server/buffer.cpp	2015-11-17 16:35:23 +0000
@@ -71,6 +71,12 @@
     return mga::to_mir_format(anwb->format);
 }
 
+void mga::Buffer::gl_rebind_to_texture()
+{
+    std::unique_lock<std::mutex> lk(content_lock);
+    native_buffer->insert_cmdfence();
+}
+
 void mga::Buffer::gl_bind_to_texture()
 {
     std::unique_lock<std::mutex> lk(content_lock);
@@ -114,9 +120,7 @@
 
     egl_extensions->glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
 
-    //TODO: we should make use of the android egl fence extension here to update the fence.
-    //      if the extension is not available, we should pass out a token that the user
-    //      will have to keep until the completion of the gl draw
+    native_buffer->insert_cmdfence();
 }
 
 std::shared_ptr<mg::NativeBuffer> mga::Buffer::native_buffer_handle() const
 
=== modified file 'src/platforms/android/server/buffer.h'
--- src/platforms/android/server/buffer.h	2015-09-04 06:46:36 +0000
+++ src/platforms/android/server/buffer.h	2015-11-17 16:35:23 +0000
@@ -56,6 +56,7 @@
     geometry::Stride stride() const override;
     MirPixelFormat pixel_format() const override;
     void gl_bind_to_texture() override;
+    void gl_rebind_to_texture() override;
     //note, you will get the native representation of an android buffer, including
     //the fences associated with the buffer. You must close these fences
     std::shared_ptr<NativeBuffer> native_buffer_handle() const override;
 
=== modified file 'src/platforms/android/server/ipc_operations.cpp'
--- src/platforms/android/server/ipc_operations.cpp	2015-06-18 14:33:10 +0000
+++ src/platforms/android/server/ipc_operations.cpp	2015-11-17 16:35:23 +0000
@@ -32,6 +32,8 @@
 {
     auto native_buffer = buffer.native_buffer_handle();
 
+    native_buffer->clear_cmdfence();
+
     mir::Fd fence_fd(native_buffer->copy_fence());
     if (fence_fd != mir::Fd::invalid)
     {
 
=== modified file 'src/server/compositor/multi_threaded_compositor.cpp'
--- src/server/compositor/multi_threaded_compositor.cpp	2015-09-22 14:53:26 +0000
+++ src/server/compositor/multi_threaded_compositor.cpp	2015-11-17 16:35:23 +0000
@@ -137,12 +137,16 @@
                 frames_scheduled--;
                 lock.unlock();
 
+                std::vector<mc::SceneElementSequence> seqs; 
                 for (auto& tuple : compositors)
                 {
                     auto& compositor = std::get<1>(tuple);
-                    compositor->composite(scene->scene_elements_for(compositor.get()));
+                    auto rs = scene->scene_elements_for(compositor.get());
+                    seqs.push_back(rs);
+                    compositor->composite(std::move(rs));
                 }
                 group.post();
+                seqs.clear();
 
                 /*
                  * "Predictive bypass" optimization: If the last frame was
 
=== modified file 'tests/acceptance-tests/test_latency.cpp'
--- tests/acceptance-tests/test_latency.cpp	2015-09-08 03:25:06 +0000
+++ tests/acceptance-tests/test_latency.cpp	2015-11-17 16:35:23 +0000
@@ -190,7 +190,7 @@
 };
 }
 
-TEST_F(ClientLatency, triple_buffered_client_uses_all_buffers)
+TEST_F(ClientLatency, DISABLED_triple_buffered_client_uses_all_buffers)
 {
     using namespace testing;
 
 
=== modified file 'tests/include/mir/test/doubles/mock_android_native_buffer.h'
--- tests/include/mir/test/doubles/mock_android_native_buffer.h	2015-06-17 05:20:42 +0000
+++ tests/include/mir/test/doubles/mock_android_native_buffer.h	2015-11-17 16:35:23 +0000
@@ -57,6 +57,9 @@
     MOCK_METHOD1(ensure_available_for, void(graphics::android::BufferAccess));
     MOCK_METHOD2(update_usage, void(graphics::android::NativeFence&, graphics::android::BufferAccess));
 
+    MOCK_METHOD0(insert_cmdfence, void());
+    MOCK_METHOD0(clear_cmdfence, void());
+
     ANativeWindowBuffer stub_anwb;
     native_handle_t native_handle;
 };
 
=== modified file 'tests/include/mir/test/doubles/stub_android_native_buffer.h'
--- tests/include/mir/test/doubles/stub_android_native_buffer.h	2015-05-29 17:53:49 +0000
+++ tests/include/mir/test/doubles/stub_android_native_buffer.h	2015-11-17 16:35:23 +0000
@@ -47,6 +47,9 @@
     void ensure_available_for(graphics::android::BufferAccess) {}
     void update_usage(graphics::android::NativeFence&, graphics::android::BufferAccess) {}
 
+    void insert_cmdfence() {}
+    void clear_cmdfence() {}
+
     ANativeWindowBuffer stub_anwb;
     native_handle_t native_handle;
 };
 
=== modified file 'tests/mir_test_doubles/mock_egl.cpp'
--- tests/mir_test_doubles/mock_egl.cpp	2015-06-25 03:00:08 +0000
+++ tests/mir_test_doubles/mock_egl.cpp	2015-11-17 16:35:23 +0000
@@ -125,6 +125,8 @@
     .WillByDefault(Return(fake_egl_image));
 
     typedef mtd::MockEGL::generic_function_pointer_t func_ptr_t;
+    ON_CALL(*this, eglGetProcAddress(_))
+        .WillByDefault(Return(nullptr));
     ON_CALL(*this, eglGetProcAddress(StrEq("eglCreateImageKHR")))
         .WillByDefault(Return(reinterpret_cast<func_ptr_t>(extension_eglCreateImageKHR)));
     ON_CALL(*this, eglGetProcAddress(StrEq("eglDestroyImageKHR")))
 
=== modified file 'tests/unit-tests/client/android/test_gralloc_registrar.cpp'
--- tests/unit-tests/client/android/test_gralloc_registrar.cpp	2015-06-25 03:00:08 +0000
+++ tests/unit-tests/client/android/test_gralloc_registrar.cpp	2015-11-17 16:35:23 +0000
@@ -19,6 +19,7 @@
 #include "mir/graphics/android/native_buffer.h"
 #include "src/platforms/android/client/gralloc_registrar.h"
 #include "mir/test/doubles/mock_android_native_buffer.h"
+#include "mir/test/doubles/mock_egl.h"
 #include <stdexcept>
 #include <fcntl.h>
 #include <gtest/gtest.h>
@@ -39,6 +40,7 @@
         unlock = hook_unlock;
     }
 
+    mtd::MockEGL mock_egl;
     MOCK_CONST_METHOD2(registerBuffer_interface,
         int(struct gralloc_module_t const*, buffer_handle_t));
     MOCK_CONST_METHOD2(unregisterBuffer_interface,
 
=== modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp'
--- tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2015-08-07 15:55:22 +0000
+++ tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2015-11-17 16:35:23 +0000
@@ -22,6 +22,7 @@
 
 #include "mir/test/doubles/mock_android_alloc_device.h"
 #include "mir/test/doubles/mock_alloc_adaptor.h"
+#include "mir/test/doubles/mock_egl.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -64,6 +65,7 @@
     int const fb_usage_flags;
     int const hw_usage_flags;
     int const sw_usage_flags;
+    mtd::MockEGL mock_egl;
 };
 
 TEST_F(AdaptorICSTest, resource_type_test_fail_ret)
 
=== modified file 'tests/unit-tests/graphics/android/test_native_buffer.cpp'
--- tests/unit-tests/graphics/android/test_native_buffer.cpp	2015-06-25 03:00:08 +0000
+++ tests/unit-tests/graphics/android/test_native_buffer.cpp	2015-11-17 16:35:23 +0000
@@ -18,6 +18,7 @@
 
 #include "mir/graphics/android/android_native_buffer.h"
 #include "mir/test/doubles/mock_fence.h"
+#include "mir/test/doubles/mock_egl.h"
 #include <memory>
 #include <gtest/gtest.h>
 
@@ -36,6 +37,7 @@
     std::shared_ptr<ANativeWindowBuffer> a_native_window_buffer;
     std::shared_ptr<mtd::MockFence> mock_fence;
     int fake_fd;
+    mtd::MockEGL mock_egl;
 };
 
 TEST_F(NativeBuffer, extends_lifetime_when_driver_calls_external_refcount_hooks)