Merge lp:~kdub/mir/egl-sync-fences into lp:mir
- egl-sync-fences
- Merge into development-branch
Proposed by
Kevin DuBois
| Status: | Merged |
|---|---|
| Approved by: | Kevin DuBois |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3169 |
| Proposed branch: | lp:~kdub/mir/egl-sync-fences |
| Merge into: | lp:mir |
| Prerequisite: | lp:~kdub/mir/android-shift-swapbuffers |
| Diff against target: |
1322 lines (+420/-48) 44 files modified
include/renderers/gl/mir/renderer/gl/texture_source.h (+10/-0) src/common/graphics/android/CMakeLists.txt (+1/-0) src/common/graphics/android/android_native_buffer.cpp (+15/-1) src/gl/recently_used_cache.cpp (+8/-7) src/include/common/mir/graphics/android/android_native_buffer.h (+6/-0) src/include/common/mir/graphics/android/native_buffer.h (+3/-0) src/platform/symbols.map (+14/-0) src/platforms/android/client/CMakeLists.txt (+2/-0) src/platforms/android/client/gralloc_registrar.cpp (+3/-1) src/platforms/android/server/CMakeLists.txt (+1/-0) src/platforms/android/server/android_alloc_adaptor.cpp (+12/-5) src/platforms/android/server/android_alloc_adaptor.h (+6/-2) src/platforms/android/server/android_buffer_allocator.cpp (+10/-4) src/platforms/android/server/android_graphic_buffer_allocator.h (+5/-1) src/platforms/android/server/buffer.cpp (+23/-4) src/platforms/android/server/buffer.h (+6/-0) src/platforms/android/server/cmdstream_sync_factory.h (+48/-0) src/platforms/android/server/display_component_factory.h (+2/-0) src/platforms/android/server/egl_sync_factory.cpp (+34/-0) src/platforms/android/server/hal_component_factory.cpp (+15/-0) src/platforms/android/server/hal_component_factory.h (+3/-1) src/platforms/android/server/ipc_operations.cpp (+1/-0) src/platforms/android/server/platform.cpp (+10/-4) src/platforms/android/server/platform.h (+3/-0) src/platforms/mesa/server/common/gbm_buffer.cpp (+9/-0) src/platforms/mesa/server/common/gbm_buffer.h (+2/-0) src/platforms/mesa/server/common/shm_buffer.cpp (+9/-0) src/platforms/mesa/server/common/shm_buffer.h (+2/-0) tests/include/mir/test/doubles/mock_android_native_buffer.h (+2/-0) tests/include/mir/test/doubles/mock_buffer.h (+1/-0) tests/include/mir/test/doubles/mock_gl_buffer.h (+2/-0) tests/include/mir/test/doubles/stub_android_native_buffer.h (+3/-0) tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h (+41/-0) tests/include/mir/test/doubles/stub_display_builder.h (+5/-0) tests/include/mir/test/doubles/stub_gl_buffer.h (+2/-0) tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+3/-0) tests/unit-tests/gl/test_gl_texture_cache.cpp (+3/-1) tests/unit-tests/gl/test_program_factory.cpp (+1/-1) tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp (+5/-2) tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp (+6/-2) tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp (+13/-1) tests/unit-tests/graphics/android/test_display_hotplug.cpp (+5/-0) tests/unit-tests/graphics/android/test_native_buffer.cpp (+50/-7) tests/unit-tests/graphics/android/test_platform.cpp (+15/-4) |
| To merge this branch: | bzr merge lp:~kdub/mir/egl-sync-fences |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Alan Griffiths | Approve | ||
| Cemil Azizoglu (community) | Approve | ||
| Andreas Pokorny (community) | Approve | ||
|
Review via email:
|
|||
Commit message
android: use the EGL_fence_sync extensions to synchronize client software buffers.
fixes: lp: #1517205
Description of the change
android: use the EGL_fence_sync extensions to synchronize client software buffers.
fixes: lp: #1517205
tested on n7, krillin, mx4. (krillin and mx4 had additional problem that will be fixed later. This MP did not make their situation worse)
Summary of Changes:
1) When the texture is used in the GLContext, raise the egl sync fence.
2) When the buffer is sent back to the client, make sure to clear the sync fence before sending it across IPC.
3) Make sure that we actually eglSwapBuffers in mir::renderer:
Helpful Details:
Why do we have to shift swapbuffers?
-- If we wait on the EGL sync fences before swapbuffers, then the wait will timeout, as the commands haven't been flushed, and the sync points won't signal. Android currently has the problem that the swapbuffers is delayed until mg::DisplayGrou
Why was swapbuffers in post?
-- HWC 1.0 has the unfortunate design that we're not allowed to call swapbuffers. HWC 1.1 and later, as well as the legacy FB module, can all call swapbuffers. We tried to bury this bad design choice, but this particular problem forces us to take different actions here. The problem we're seeing here is really why the HWC 1.1 api designers gave swapbuffers back to the server.
What was the problem?
glEGLTargetText
What's still wrong with krillin/mx4?
https:/
note: this should land at the same time as the stacked on branch:
https:/
I split the MP up for the benefit of reviewing (esp as we have to shift swapping behavior a bit)
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:3128
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:3130
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
None: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
None: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:3134
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
SUCCESS: http://
deb: http://
None: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
+ //must be called if using this buffer after initial texture upload
+ virtual void used_as_texture() = 0;
The comment suggests this is an easy-to-use-wrongly API and the name suggest a query, not a property setter.
I'm not very familiar with this code, but could gl_bind_
Alternatively, as the underlying action ("native_
~~~~
+ void used_by_gpu();
+ void ensure_
Again, this naming isn't great. Maybe "lock_for_
review:
Needs Information
Revision history for this message
| Andreas Pokorny (andreas-pokorny) wrote : | # |
I agree with Alans comments, better naming is needed.
Under the premise of those being resolved - the solution looks good and solves the bug even on n10
review:
Approve
Revision history for this message
| Cemil Azizoglu (cemil-azizoglu) wrote : | # |
I got a failure on PD silo (which merges this branch) and fixed it using the following patch :
=== modified file 'tests/
--- tests/unit-
+++ tests/unit-
@@ -18,11 +18,14 @@
#include "src/platforms/
#include "src/platforms/
+#include "src/platforms/
#include "mir/graphics/
#include "mir/test/
#include "mir/test/
+#include "mir/test/
+
#include <gtest/gtest.h>
#include <gmock/gmock.h>
#include <stdexcept>
@@ -47,6 +50,7 @@
using namespace testing;
+ auto sync_factory = std::make_
auto quirks = std::make_
@@ -57,6 +61,7 @@
std:
std:
+ ::testing:
MirPixelFormat pf;
geom::Size size;
review:
Needs Fixing
Revision history for this message
| Cemil Azizoglu (cemil-azizoglu) wrote : | # |
Just realized the patch above was taken w.r.t. the trunk not this branch, so it will not apply cleanly. So just stick the added lines to your branch instead.
Revision history for this message
| Kevin DuBois (kdub) wrote : | # |
Will try to improve the naming, although something that is nicer to use might take more invasive structural changes.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:3137
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Kevin DuBois (kdub) wrote : | # |
> I'm not very familiar with this code, but could gl_bind_
> in both branches (which might then be merged into one)?
gl_bind_to_texture possibly uploads the texture, so calling it twice when not needed will waste texture uploads. We need the second function that adds the sync point without uploading, mostly for texture cache usage.
Ideally, I'd change it to:
//uploads
gl_bind_
//adds sync points
secure_for_render()
but this doesn't fix the bugs for downstreams.
I think I'll go with:
//deprecated/
gl_bind_
//uploads
bind()
//adds sync points
secure_for_render()
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
> > I'm not very familiar with this code, but could gl_bind_
> made idempotent and called
> > in both branches (which might then be merged into one)?
>
> gl_bind_to_texture possibly uploads the texture, so calling it twice when not
> needed will waste texture uploads. We need the second function that adds the
> sync point without uploading, mostly for texture cache usage.
I was wondering if gl_bind_
>
> Ideally, I'd change it to:
> //uploads
> gl_bind_
> //adds sync points
> secure_for_render()
>
> but this doesn't fix the bugs for downstreams.
Its also an easy to misuse API as it requires a specific order of calls. It is almost as though secure_for_render() should return an object (a future?) whose destructor does the wait for the gpu release.
> I think I'll go with:
> //deprecated/
> gl_bind_
> //uploads
> bind()
> //adds sync points
> secure_for_render()
OK, I don't have strong feelings against this, it is better than the current proposal.
Revision history for this message
| Cemil Azizoglu (cemil-azizoglu) wrote : | # |
LGTM ...and works.
review:
Approve
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
This naming isn't actively misleading, and I'll accept the remaining ugliness as largely preexisting.
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:3141
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Kevin DuBois (kdub) wrote : | # |
hmm, not in the autolanding queue after 1 day. will retoggle
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === renamed file 'src/include/platform/mir/graphics/egl_extensions.h' => 'include/platform/mir/graphics/egl_extensions.h' | |||
| 2 | === renamed file 'src/include/platform/mir/graphics/egl_sync_fence.h' => 'include/platform/mir/graphics/egl_sync_fence.h' | |||
| 3 | === modified file 'include/renderers/gl/mir/renderer/gl/texture_source.h' | |||
| 4 | --- include/renderers/gl/mir/renderer/gl/texture_source.h 2015-09-15 17:13:45 +0000 | |||
| 5 | +++ include/renderers/gl/mir/renderer/gl/texture_source.h 2015-12-02 16:15:28 +0000 | |||
| 6 | @@ -26,12 +26,22 @@ | |||
| 7 | 26 | namespace gl | 26 | namespace gl |
| 8 | 27 | { | 27 | { |
| 9 | 28 | 28 | ||
| 10 | 29 | //FIXME: (kdub) we're not hiding the differences in texture upload approaches between our platforms | ||
| 11 | 30 | // very well with this interface. | ||
| 12 | 29 | class TextureSource | 31 | class TextureSource |
| 13 | 30 | { | 32 | { |
| 14 | 31 | public: | 33 | public: |
| 15 | 32 | virtual ~TextureSource() = default; | 34 | virtual ~TextureSource() = default; |
| 16 | 33 | 35 | ||
| 17 | 36 | // \warning deprecated, provided for convenience and legacy transition. | ||
| 18 | 37 | //will call bind() and then secure_for_render() | ||
| 19 | 34 | virtual void gl_bind_to_texture() = 0; | 38 | virtual void gl_bind_to_texture() = 0; |
| 20 | 39 | //Uploads texture. | ||
| 21 | 40 | virtual void bind() = 0; | ||
| 22 | 41 | //add synchronization points to the command stream to ensure resources | ||
| 23 | 42 | //are present during the draw. Will not upload texture. | ||
| 24 | 43 | //should be called if an already uploaded texture is reused. | ||
| 25 | 44 | virtual void secure_for_render() = 0; | ||
| 26 | 35 | 45 | ||
| 27 | 36 | protected: | 46 | protected: |
| 28 | 37 | TextureSource() = default; | 47 | TextureSource() = default; |
| 29 | 38 | 48 | ||
| 30 | === modified file 'src/common/graphics/android/CMakeLists.txt' | |||
| 31 | --- src/common/graphics/android/CMakeLists.txt 2015-09-24 04:18:40 +0000 | |||
| 32 | +++ src/common/graphics/android/CMakeLists.txt 2015-12-02 16:15:28 +0000 | |||
| 33 | @@ -1,5 +1,6 @@ | |||
| 34 | 1 | include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS}) | 1 | include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS}) |
| 35 | 2 | include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps) | 2 | include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps) |
| 36 | 3 | include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/include/platform) | ||
| 37 | 3 | 4 | ||
| 38 | 4 | add_definitions( -DANDROID ) | 5 | add_definitions( -DANDROID ) |
| 39 | 5 | 6 | ||
| 40 | 6 | 7 | ||
| 41 | === modified file 'src/common/graphics/android/android_native_buffer.cpp' | |||
| 42 | --- src/common/graphics/android/android_native_buffer.cpp 2015-06-17 05:20:42 +0000 | |||
| 43 | +++ src/common/graphics/android/android_native_buffer.cpp 2015-12-02 16:15:28 +0000 | |||
| 44 | @@ -17,14 +17,17 @@ | |||
| 45 | 17 | */ | 17 | */ |
| 46 | 18 | 18 | ||
| 47 | 19 | #include "mir/graphics/android/android_native_buffer.h" | 19 | #include "mir/graphics/android/android_native_buffer.h" |
| 48 | 20 | #include "mir/graphics/egl_sync_fence.h" | ||
| 49 | 20 | 21 | ||
| 50 | 21 | namespace mga=mir::graphics::android; | 22 | namespace mga=mir::graphics::android; |
| 51 | 22 | 23 | ||
| 52 | 23 | mga::AndroidNativeBuffer::AndroidNativeBuffer( | 24 | mga::AndroidNativeBuffer::AndroidNativeBuffer( |
| 53 | 24 | std::shared_ptr<ANativeWindowBuffer> const& anwb, | 25 | std::shared_ptr<ANativeWindowBuffer> const& anwb, |
| 54 | 26 | std::shared_ptr<CommandStreamSync> const& cmdstream_sync, | ||
| 55 | 25 | std::shared_ptr<Fence> const& fence, | 27 | std::shared_ptr<Fence> const& fence, |
| 56 | 26 | BufferAccess access) | 28 | BufferAccess access) |
| 58 | 27 | : fence(fence), | 29 | : cmdstream_sync(cmdstream_sync), |
| 59 | 30 | fence(fence), | ||
| 60 | 28 | access(access), | 31 | access(access), |
| 61 | 29 | native_window_buffer(anwb) | 32 | native_window_buffer(anwb) |
| 62 | 30 | { | 33 | { |
| 63 | @@ -58,3 +61,14 @@ | |||
| 64 | 58 | { | 61 | { |
| 65 | 59 | return fence->copy_native_handle(); | 62 | return fence->copy_native_handle(); |
| 66 | 60 | } | 63 | } |
| 67 | 64 | |||
| 68 | 65 | void mga::AndroidNativeBuffer::lock_for_gpu() | ||
| 69 | 66 | { | ||
| 70 | 67 | cmdstream_sync->raise(); | ||
| 71 | 68 | } | ||
| 72 | 69 | |||
| 73 | 70 | void mga::AndroidNativeBuffer::wait_for_unlock_by_gpu() | ||
| 74 | 71 | { | ||
| 75 | 72 | using namespace std::chrono; | ||
| 76 | 73 | cmdstream_sync->wait_for(duration_cast<nanoseconds>(seconds(2))); | ||
| 77 | 74 | } | ||
| 78 | 61 | 75 | ||
| 79 | === modified file 'src/gl/recently_used_cache.cpp' | |||
| 80 | --- src/gl/recently_used_cache.cpp 2015-10-06 02:30:52 +0000 | |||
| 81 | +++ src/gl/recently_used_cache.cpp 2015-12-02 16:15:28 +0000 | |||
| 82 | @@ -27,6 +27,7 @@ | |||
| 83 | 27 | namespace mg = mir::graphics; | 27 | namespace mg = mir::graphics; |
| 84 | 28 | namespace mgl = mir::gl; | 28 | namespace mgl = mir::gl; |
| 85 | 29 | namespace geom = mir::geometry; | 29 | namespace geom = mir::geometry; |
| 86 | 30 | namespace mrgl = mir::renderer::gl; | ||
| 87 | 30 | 31 | ||
| 88 | 31 | std::shared_ptr<mgl::Texture> mgl::RecentlyUsedCache::load(mg::Renderable const& renderable) | 32 | std::shared_ptr<mgl::Texture> mgl::RecentlyUsedCache::load(mg::Renderable const& renderable) |
| 89 | 32 | { | 33 | { |
| 90 | @@ -35,18 +36,18 @@ | |||
| 91 | 35 | auto& texture = textures[renderable.id()]; | 36 | auto& texture = textures[renderable.id()]; |
| 92 | 36 | texture.texture->bind(); | 37 | texture.texture->bind(); |
| 93 | 37 | 38 | ||
| 94 | 39 | auto const texture_source = dynamic_cast<mrgl::TextureSource*>(buffer->native_buffer_base()); | ||
| 95 | 40 | if (!texture_source) | ||
| 96 | 41 | BOOST_THROW_EXCEPTION(std::logic_error("Buffer does not support GL rendering")); | ||
| 97 | 42 | |||
| 98 | 38 | if ((texture.last_bound_buffer != buffer_id) || (!texture.valid_binding)) | 43 | if ((texture.last_bound_buffer != buffer_id) || (!texture.valid_binding)) |
| 99 | 39 | { | 44 | { |
| 107 | 40 | auto const texture_source = | 45 | texture_source->bind(); |
| 101 | 41 | dynamic_cast<mir::renderer::gl::TextureSource*>( | ||
| 102 | 42 | buffer->native_buffer_base()); | ||
| 103 | 43 | if (!texture_source) | ||
| 104 | 44 | BOOST_THROW_EXCEPTION(std::logic_error("Buffer does not support GL rendering")); | ||
| 105 | 45 | |||
| 106 | 46 | texture_source->gl_bind_to_texture(); | ||
| 108 | 47 | texture.resource = buffer; | 46 | texture.resource = buffer; |
| 109 | 48 | texture.last_bound_buffer = buffer_id; | 47 | texture.last_bound_buffer = buffer_id; |
| 110 | 49 | } | 48 | } |
| 111 | 49 | texture_source->secure_for_render(); | ||
| 112 | 50 | |||
| 113 | 50 | texture.valid_binding = true; | 51 | texture.valid_binding = true; |
| 114 | 51 | texture.used = true; | 52 | texture.used = true; |
| 115 | 52 | 53 | ||
| 116 | 53 | 54 | ||
| 117 | === modified file 'src/include/common/mir/graphics/android/android_native_buffer.h' | |||
| 118 | --- src/include/common/mir/graphics/android/android_native_buffer.h 2015-06-17 05:20:42 +0000 | |||
| 119 | +++ src/include/common/mir/graphics/android/android_native_buffer.h 2015-12-02 16:15:28 +0000 | |||
| 120 | @@ -27,6 +27,7 @@ | |||
| 121 | 27 | { | 27 | { |
| 122 | 28 | namespace graphics | 28 | namespace graphics |
| 123 | 29 | { | 29 | { |
| 124 | 30 | class CommandStreamSync; | ||
| 125 | 30 | namespace android | 31 | namespace android |
| 126 | 31 | { | 32 | { |
| 127 | 32 | class Fence; | 33 | class Fence; |
| 128 | @@ -35,6 +36,7 @@ | |||
| 129 | 35 | { | 36 | { |
| 130 | 36 | AndroidNativeBuffer( | 37 | AndroidNativeBuffer( |
| 131 | 37 | std::shared_ptr<ANativeWindowBuffer> const& handle, | 38 | std::shared_ptr<ANativeWindowBuffer> const& handle, |
| 132 | 39 | std::shared_ptr<CommandStreamSync> const& cmdstream_sync, | ||
| 133 | 38 | std::shared_ptr<Fence> const& fence, | 40 | std::shared_ptr<Fence> const& fence, |
| 134 | 39 | BufferAccess fence_access); | 41 | BufferAccess fence_access); |
| 135 | 40 | 42 | ||
| 136 | @@ -45,7 +47,11 @@ | |||
| 137 | 45 | void ensure_available_for(BufferAccess); | 47 | void ensure_available_for(BufferAccess); |
| 138 | 46 | void update_usage(NativeFence& merge_fd, BufferAccess); | 48 | void update_usage(NativeFence& merge_fd, BufferAccess); |
| 139 | 47 | 49 | ||
| 140 | 50 | void lock_for_gpu(); | ||
| 141 | 51 | void wait_for_unlock_by_gpu(); | ||
| 142 | 52 | |||
| 143 | 48 | private: | 53 | private: |
| 144 | 54 | std::shared_ptr<CommandStreamSync> cmdstream_sync; | ||
| 145 | 49 | std::shared_ptr<Fence> fence; | 55 | std::shared_ptr<Fence> fence; |
| 146 | 50 | BufferAccess access; | 56 | BufferAccess access; |
| 147 | 51 | std::shared_ptr<ANativeWindowBuffer> native_window_buffer; | 57 | std::shared_ptr<ANativeWindowBuffer> native_window_buffer; |
| 148 | 52 | 58 | ||
| 149 | === modified file 'src/include/common/mir/graphics/android/native_buffer.h' | |||
| 150 | --- src/include/common/mir/graphics/android/native_buffer.h 2015-06-17 05:20:42 +0000 | |||
| 151 | +++ src/include/common/mir/graphics/android/native_buffer.h 2015-12-02 16:15:28 +0000 | |||
| 152 | @@ -53,6 +53,9 @@ | |||
| 153 | 53 | virtual void ensure_available_for(android::BufferAccess intent) = 0; | 53 | virtual void ensure_available_for(android::BufferAccess intent) = 0; |
| 154 | 54 | virtual void update_usage(android::NativeFence& fence, android::BufferAccess current_usage) = 0; | 54 | virtual void update_usage(android::NativeFence& fence, android::BufferAccess current_usage) = 0; |
| 155 | 55 | 55 | ||
| 156 | 56 | virtual void lock_for_gpu() = 0; | ||
| 157 | 57 | virtual void wait_for_unlock_by_gpu() = 0; | ||
| 158 | 58 | |||
| 159 | 56 | protected: | 59 | protected: |
| 160 | 57 | NativeBuffer() = default; | 60 | NativeBuffer() = default; |
| 161 | 58 | NativeBuffer(NativeBuffer const&) = delete; | 61 | NativeBuffer(NativeBuffer const&) = delete; |
| 162 | 59 | 62 | ||
| 163 | === modified file 'src/platform/symbols.map' | |||
| 164 | --- src/platform/symbols.map 2015-11-04 14:22:48 +0000 | |||
| 165 | +++ src/platform/symbols.map 2015-12-02 16:15:28 +0000 | |||
| 166 | @@ -219,6 +219,7 @@ | |||
| 167 | 219 | vtable?for?mir::graphics::EventHandlerRegister; | 219 | vtable?for?mir::graphics::EventHandlerRegister; |
| 168 | 220 | vtable?for?mir::graphics::GLConfig; | 220 | vtable?for?mir::graphics::GLConfig; |
| 169 | 221 | vtable?for?mir::graphics::GLContext; | 221 | vtable?for?mir::graphics::GLContext; |
| 170 | 222 | vtable?for?mir::graphics::NullCommandSync; | ||
| 171 | 222 | vtable?for?mir::graphics::GraphicBufferAllocator; | 223 | vtable?for?mir::graphics::GraphicBufferAllocator; |
| 172 | 223 | vtable?for?mir::graphics::Platform; | 224 | vtable?for?mir::graphics::Platform; |
| 173 | 224 | vtable?for?mir::graphics::PlatformIpcOperations; | 225 | vtable?for?mir::graphics::PlatformIpcOperations; |
| 174 | @@ -237,6 +238,19 @@ | |||
| 175 | 237 | mir::graphics::blue_channel_depth*; | 238 | mir::graphics::blue_channel_depth*; |
| 176 | 238 | mir::graphics::contains_alpha*; | 239 | mir::graphics::contains_alpha*; |
| 177 | 239 | mir::graphics::EGLExtensions::EGLExtensions*; | 240 | mir::graphics::EGLExtensions::EGLExtensions*; |
| 178 | 241 | mir::graphics::EGLSyncExtensions::EGLSyncExtensions*; | ||
| 179 | 242 | mir::graphics::CommandStreamSync::?CommandStreamSync*; | ||
| 180 | 243 | mir::graphics::CommandStreamSync::CommandStreamSync*; | ||
| 181 | 244 | mir::graphics::CommandStreamSync::CommandStreamSync*; | ||
| 182 | 245 | mir::graphics::CommandStreamSync::operator*; | ||
| 183 | 246 | mir::graphics::NullCommandSync::?NullCommandSync*; | ||
| 184 | 247 | mir::graphics::NullCommandSync::NullCommandSync*; | ||
| 185 | 248 | mir::graphics::NullCommandSync::NullCommandSync*; | ||
| 186 | 249 | mir::graphics::NullCommandSync::operator*; | ||
| 187 | 250 | mir::graphics::EGLSyncFence::?EGLSyncFence*; | ||
| 188 | 251 | mir::graphics::EGLSyncFence::EGLSyncFence*; | ||
| 189 | 252 | mir::graphics::EGLSyncFence::EGLSyncFence*; | ||
| 190 | 253 | mir::graphics::EGLSyncFence::operator*; | ||
| 191 | 240 | mir::graphics::EGLContextStore::?EGLContextStore*; | 254 | mir::graphics::EGLContextStore::?EGLContextStore*; |
| 192 | 241 | mir::graphics::EGLContextStore::EGLContextStore*; | 255 | mir::graphics::EGLContextStore::EGLContextStore*; |
| 193 | 242 | mir::graphics::EGLContextStore::EGLContextStore*; | 256 | mir::graphics::EGLContextStore::EGLContextStore*; |
| 194 | 243 | 257 | ||
| 195 | === modified file 'src/platforms/android/client/CMakeLists.txt' | |||
| 196 | --- src/platforms/android/client/CMakeLists.txt 2015-11-04 07:43:28 +0000 | |||
| 197 | +++ src/platforms/android/client/CMakeLists.txt 2015-12-02 16:15:28 +0000 | |||
| 198 | @@ -1,6 +1,7 @@ | |||
| 199 | 1 | include_directories(${client_common_include_dirs}) | 1 | include_directories(${client_common_include_dirs}) |
| 200 | 2 | include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS}) | 2 | include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS}) |
| 201 | 3 | include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps) | 3 | include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps) |
| 202 | 4 | include_directories(${CMAKE_SOURCE_DIR}/include/platform) | ||
| 203 | 4 | 5 | ||
| 204 | 5 | add_definitions(-DANDROID) | 6 | add_definitions(-DANDROID) |
| 205 | 6 | 7 | ||
| 206 | @@ -35,6 +36,7 @@ | |||
| 207 | 35 | mirclient | 36 | mirclient |
| 208 | 36 | client_platform_common | 37 | client_platform_common |
| 209 | 37 | mirsharedandroid-static | 38 | mirsharedandroid-static |
| 210 | 39 | mirplatform | ||
| 211 | 38 | ${LIBHARDWARE_LIBRARIES} | 40 | ${LIBHARDWARE_LIBRARIES} |
| 212 | 39 | ) | 41 | ) |
| 213 | 40 | 42 | ||
| 214 | 41 | 43 | ||
| 215 | === modified file 'src/platforms/android/client/gralloc_registrar.cpp' | |||
| 216 | --- src/platforms/android/client/gralloc_registrar.cpp 2015-06-18 14:33:10 +0000 | |||
| 217 | +++ src/platforms/android/client/gralloc_registrar.cpp 2015-12-02 16:15:28 +0000 | |||
| 218 | @@ -18,6 +18,7 @@ | |||
| 219 | 18 | 18 | ||
| 220 | 19 | #include "mir/graphics/android/android_native_buffer.h" | 19 | #include "mir/graphics/android/android_native_buffer.h" |
| 221 | 20 | #include "mir/graphics/android/sync_fence.h" | 20 | #include "mir/graphics/android/sync_fence.h" |
| 222 | 21 | #include "mir/graphics/egl_sync_fence.h" | ||
| 223 | 21 | #include "gralloc_registrar.h" | 22 | #include "gralloc_registrar.h" |
| 224 | 22 | #include "mir/client_buffer.h" | 23 | #include "mir/client_buffer.h" |
| 225 | 23 | 24 | ||
| 226 | @@ -82,7 +83,8 @@ | |||
| 227 | 82 | anwb->usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER; | 83 | anwb->usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER; |
| 228 | 83 | anwb->handle = handle.get(); | 84 | anwb->handle = handle.get(); |
| 229 | 84 | 85 | ||
| 231 | 85 | return std::make_shared<mga::AndroidNativeBuffer>(anwb, fence, mga::BufferAccess::read); | 86 | auto sync = std::make_shared<mg::NullCommandSync>(); //no need for eglsync client side |
| 232 | 87 | return std::make_shared<mga::AndroidNativeBuffer>(anwb, sync, fence, mga::BufferAccess::read); | ||
| 233 | 86 | } | 88 | } |
| 234 | 87 | } | 89 | } |
| 235 | 88 | std::shared_ptr<mg::NativeBuffer> mcla::GrallocRegistrar::register_buffer( | 90 | std::shared_ptr<mg::NativeBuffer> mcla::GrallocRegistrar::register_buffer( |
| 236 | 89 | 91 | ||
| 237 | === modified file 'src/platforms/android/server/CMakeLists.txt' | |||
| 238 | --- src/platforms/android/server/CMakeLists.txt 2015-11-04 07:43:28 +0000 | |||
| 239 | +++ src/platforms/android/server/CMakeLists.txt 2015-12-02 16:15:28 +0000 | |||
| 240 | @@ -43,6 +43,7 @@ | |||
| 241 | 43 | hwc_fallback_gl_renderer.cpp | 43 | hwc_fallback_gl_renderer.cpp |
| 242 | 44 | ipc_operations.cpp | 44 | ipc_operations.cpp |
| 243 | 45 | hwc_blanking_control.cpp | 45 | hwc_blanking_control.cpp |
| 244 | 46 | egl_sync_factory.cpp | ||
| 245 | 46 | ) | 47 | ) |
| 246 | 47 | 48 | ||
| 247 | 48 | add_library(mirplatformgraphicsandroid SHARED | 49 | add_library(mirplatformgraphicsandroid SHARED |
| 248 | 49 | 50 | ||
| 249 | === modified file 'src/platforms/android/server/android_alloc_adaptor.cpp' | |||
| 250 | --- src/platforms/android/server/android_alloc_adaptor.cpp 2015-08-07 15:55:22 +0000 | |||
| 251 | +++ src/platforms/android/server/android_alloc_adaptor.cpp 2015-12-02 16:15:28 +0000 | |||
| 252 | @@ -20,7 +20,9 @@ | |||
| 253 | 20 | #include "mir/graphics/android/android_native_buffer.h" | 20 | #include "mir/graphics/android/android_native_buffer.h" |
| 254 | 21 | #include "mir/graphics/android/sync_fence.h" | 21 | #include "mir/graphics/android/sync_fence.h" |
| 255 | 22 | #include "mir/graphics/android/android_format_conversion-inl.h" | 22 | #include "mir/graphics/android/android_format_conversion-inl.h" |
| 256 | 23 | #include "mir/graphics/egl_sync_fence.h" | ||
| 257 | 23 | #include "android_alloc_adaptor.h" | 24 | #include "android_alloc_adaptor.h" |
| 258 | 25 | #include "cmdstream_sync_factory.h" | ||
| 259 | 24 | #include "device_quirks.h" | 26 | #include "device_quirks.h" |
| 260 | 25 | 27 | ||
| 261 | 26 | #include <boost/throw_exception.hpp> | 28 | #include <boost/throw_exception.hpp> |
| 262 | @@ -48,10 +50,13 @@ | |||
| 263 | 48 | }; | 50 | }; |
| 264 | 49 | } | 51 | } |
| 265 | 50 | 52 | ||
| 270 | 51 | mga::AndroidAllocAdaptor::AndroidAllocAdaptor(std::shared_ptr<struct alloc_device_t> const& alloc_device, | 53 | mga::AndroidAllocAdaptor::AndroidAllocAdaptor( |
| 271 | 52 | std::shared_ptr<DeviceQuirks> const& quirks) | 54 | std::shared_ptr<struct alloc_device_t> const& alloc_device, |
| 272 | 53 | : alloc_dev(alloc_device), | 55 | std::shared_ptr<CommandStreamSyncFactory> const& sync_factory, |
| 273 | 54 | quirks(quirks) | 56 | std::shared_ptr<DeviceQuirks> const& quirks) : |
| 274 | 57 | alloc_dev(alloc_device), | ||
| 275 | 58 | sync_factory(sync_factory), | ||
| 276 | 59 | quirks(quirks) | ||
| 277 | 55 | { | 60 | { |
| 278 | 56 | } | 61 | } |
| 279 | 57 | 62 | ||
| 280 | @@ -94,7 +99,9 @@ | |||
| 281 | 94 | anwb->format = format; | 99 | anwb->format = format; |
| 282 | 95 | anwb->usage = usage_flag; | 100 | anwb->usage = usage_flag; |
| 283 | 96 | 101 | ||
| 285 | 97 | return std::make_shared<mga::AndroidNativeBuffer>(anwb, fence, mga::BufferAccess::read); | 102 | return std::make_shared<mga::AndroidNativeBuffer>(anwb, |
| 286 | 103 | sync_factory->create_command_stream_sync(), | ||
| 287 | 104 | fence, mga::BufferAccess::read); | ||
| 288 | 98 | } | 105 | } |
| 289 | 99 | 106 | ||
| 290 | 100 | int mga::AndroidAllocAdaptor::convert_to_android_usage(BufferUsage usage) | 107 | int mga::AndroidAllocAdaptor::convert_to_android_usage(BufferUsage usage) |
| 291 | 101 | 108 | ||
| 292 | === modified file 'src/platforms/android/server/android_alloc_adaptor.h' | |||
| 293 | --- src/platforms/android/server/android_alloc_adaptor.h 2015-06-24 11:33:02 +0000 | |||
| 294 | +++ src/platforms/android/server/android_alloc_adaptor.h 2015-12-02 16:15:28 +0000 | |||
| 295 | @@ -31,12 +31,15 @@ | |||
| 296 | 31 | namespace android | 31 | namespace android |
| 297 | 32 | { | 32 | { |
| 298 | 33 | class DeviceQuirks; | 33 | class DeviceQuirks; |
| 299 | 34 | class CommandStreamSyncFactory; | ||
| 300 | 34 | 35 | ||
| 301 | 35 | class AndroidAllocAdaptor : public GraphicAllocAdaptor | 36 | class AndroidAllocAdaptor : public GraphicAllocAdaptor |
| 302 | 36 | { | 37 | { |
| 303 | 37 | public: | 38 | public: |
| 306 | 38 | explicit AndroidAllocAdaptor(std::shared_ptr<struct alloc_device_t> const& alloc_device, | 39 | explicit AndroidAllocAdaptor( |
| 307 | 39 | std::shared_ptr<DeviceQuirks> const& quirks); | 40 | std::shared_ptr<struct alloc_device_t> const& alloc_device, |
| 308 | 41 | std::shared_ptr<CommandStreamSyncFactory> const& cmdstream_sync_factory, | ||
| 309 | 42 | std::shared_ptr<DeviceQuirks> const& quirks); | ||
| 310 | 40 | std::shared_ptr<NativeBuffer> alloc_buffer(geometry::Size, | 43 | std::shared_ptr<NativeBuffer> alloc_buffer(geometry::Size, |
| 311 | 41 | MirPixelFormat, BufferUsage usage); | 44 | MirPixelFormat, BufferUsage usage); |
| 312 | 42 | 45 | ||
| 313 | @@ -44,6 +47,7 @@ | |||
| 314 | 44 | 47 | ||
| 315 | 45 | private: | 48 | private: |
| 316 | 46 | std::shared_ptr<struct alloc_device_t> alloc_dev; | 49 | std::shared_ptr<struct alloc_device_t> alloc_dev; |
| 317 | 50 | std::shared_ptr<CommandStreamSyncFactory> const sync_factory; | ||
| 318 | 47 | std::shared_ptr<DeviceQuirks> const quirks; | 51 | std::shared_ptr<DeviceQuirks> const quirks; |
| 319 | 48 | int convert_to_android_usage(BufferUsage usage); | 52 | int convert_to_android_usage(BufferUsage usage); |
| 320 | 49 | }; | 53 | }; |
| 321 | 50 | 54 | ||
| 322 | === modified file 'src/platforms/android/server/android_buffer_allocator.cpp' | |||
| 323 | --- src/platforms/android/server/android_buffer_allocator.cpp 2015-11-25 12:59:13 +0000 | |||
| 324 | +++ src/platforms/android/server/android_buffer_allocator.cpp 2015-12-02 16:15:28 +0000 | |||
| 325 | @@ -19,12 +19,14 @@ | |||
| 326 | 19 | 19 | ||
| 327 | 20 | #include "mir/graphics/platform.h" | 20 | #include "mir/graphics/platform.h" |
| 328 | 21 | #include "mir/graphics/egl_extensions.h" | 21 | #include "mir/graphics/egl_extensions.h" |
| 329 | 22 | #include "mir/graphics/egl_sync_fence.h" | ||
| 330 | 22 | #include "mir/graphics/buffer_properties.h" | 23 | #include "mir/graphics/buffer_properties.h" |
| 331 | 23 | #include "mir/graphics/android/sync_fence.h" | 24 | #include "mir/graphics/android/sync_fence.h" |
| 332 | 24 | #include "mir/graphics/android/android_native_buffer.h" | 25 | #include "mir/graphics/android/android_native_buffer.h" |
| 333 | 25 | #include "android_graphic_buffer_allocator.h" | 26 | #include "android_graphic_buffer_allocator.h" |
| 334 | 26 | #include "android_alloc_adaptor.h" | 27 | #include "android_alloc_adaptor.h" |
| 335 | 27 | #include "buffer.h" | 28 | #include "buffer.h" |
| 336 | 29 | #include "cmdstream_sync_factory.h" | ||
| 337 | 28 | #include "device_quirks.h" | 30 | #include "device_quirks.h" |
| 338 | 29 | 31 | ||
| 339 | 30 | #include <boost/throw_exception.hpp> | 32 | #include <boost/throw_exception.hpp> |
| 340 | @@ -50,8 +52,11 @@ | |||
| 341 | 50 | 52 | ||
| 342 | 51 | } | 53 | } |
| 343 | 52 | 54 | ||
| 346 | 53 | mga::AndroidGraphicBufferAllocator::AndroidGraphicBufferAllocator(std::shared_ptr<DeviceQuirks> const& quirks) | 55 | mga::AndroidGraphicBufferAllocator::AndroidGraphicBufferAllocator( |
| 347 | 54 | : egl_extensions(std::make_shared<mg::EGLExtensions>()) | 56 | std::shared_ptr<CommandStreamSyncFactory> const& cmdstream_sync_factory, |
| 348 | 57 | std::shared_ptr<DeviceQuirks> const& quirks) | ||
| 349 | 58 | : egl_extensions(std::make_shared<mg::EGLExtensions>()), | ||
| 350 | 59 | cmdstream_sync_factory(cmdstream_sync_factory) | ||
| 351 | 55 | { | 60 | { |
| 352 | 56 | int err; | 61 | int err; |
| 353 | 57 | 62 | ||
| 354 | @@ -70,7 +75,7 @@ | |||
| 355 | 70 | std::shared_ptr<struct alloc_device_t> alloc_dev_ptr( | 75 | std::shared_ptr<struct alloc_device_t> alloc_dev_ptr( |
| 356 | 71 | alloc_dev, | 76 | alloc_dev, |
| 357 | 72 | quirks->gralloc_cannot_be_closed_safely() ? null_alloc_dev_deleter : alloc_dev_deleter); | 77 | quirks->gralloc_cannot_be_closed_safely() ? null_alloc_dev_deleter : alloc_dev_deleter); |
| 359 | 73 | alloc_device = std::shared_ptr<mga::GraphicAllocAdaptor>(new AndroidAllocAdaptor(alloc_dev_ptr, quirks)); | 78 | alloc_device = std::shared_ptr<mga::GraphicAllocAdaptor>(new AndroidAllocAdaptor(alloc_dev_ptr, cmdstream_sync_factory, quirks)); |
| 360 | 74 | } | 79 | } |
| 361 | 75 | 80 | ||
| 362 | 76 | std::shared_ptr<mg::Buffer> mga::AndroidGraphicBufferAllocator::alloc_buffer( | 81 | std::shared_ptr<mg::Buffer> mga::AndroidGraphicBufferAllocator::alloc_buffer( |
| 363 | @@ -89,9 +94,10 @@ | |||
| 364 | 89 | [](ANativeWindowBuffer* buffer){ buffer->common.decRef(&buffer->common); }); | 94 | [](ANativeWindowBuffer* buffer){ buffer->common.decRef(&buffer->common); }); |
| 365 | 90 | anwb->common.incRef(&anwb->common); | 95 | anwb->common.incRef(&anwb->common); |
| 366 | 91 | 96 | ||
| 367 | 97 | //TODO: we should have an android platform function for accessing the fence. | ||
| 368 | 92 | auto native_handle = std::make_shared<mga::AndroidNativeBuffer>( | 98 | auto native_handle = std::make_shared<mga::AndroidNativeBuffer>( |
| 369 | 93 | native_window_buffer, | 99 | native_window_buffer, |
| 371 | 94 | //TODO: we should have an android platform function for accessing the fence. | 100 | cmdstream_sync_factory->create_command_stream_sync(), |
| 372 | 95 | std::make_shared<mga::SyncFence>(std::make_shared<mga::RealSyncFileOps>(), mir::Fd()), | 101 | std::make_shared<mga::SyncFence>(std::make_shared<mga::RealSyncFileOps>(), mir::Fd()), |
| 373 | 96 | mga::BufferAccess::read); | 102 | mga::BufferAccess::read); |
| 374 | 97 | return std::make_unique<Buffer>( | 103 | return std::make_unique<Buffer>( |
| 375 | 98 | 104 | ||
| 376 | === modified file 'src/platforms/android/server/android_graphic_buffer_allocator.h' | |||
| 377 | --- src/platforms/android/server/android_graphic_buffer_allocator.h 2015-06-24 11:33:02 +0000 | |||
| 378 | +++ src/platforms/android/server/android_graphic_buffer_allocator.h 2015-12-02 16:15:28 +0000 | |||
| 379 | @@ -39,11 +39,14 @@ | |||
| 380 | 39 | 39 | ||
| 381 | 40 | class GraphicAllocAdaptor; | 40 | class GraphicAllocAdaptor; |
| 382 | 41 | class DeviceQuirks; | 41 | class DeviceQuirks; |
| 383 | 42 | class CommandStreamSyncFactory; | ||
| 384 | 42 | 43 | ||
| 385 | 43 | class AndroidGraphicBufferAllocator: public GraphicBufferAllocator, public graphics::GraphicBufferAllocator | 44 | class AndroidGraphicBufferAllocator: public GraphicBufferAllocator, public graphics::GraphicBufferAllocator |
| 386 | 44 | { | 45 | { |
| 387 | 45 | public: | 46 | public: |
| 389 | 46 | AndroidGraphicBufferAllocator(std::shared_ptr<DeviceQuirks> const& quirks); | 47 | AndroidGraphicBufferAllocator( |
| 390 | 48 | std::shared_ptr<CommandStreamSyncFactory> const& cmdstream_sync_factory, | ||
| 391 | 49 | std::shared_ptr<DeviceQuirks> const& quirks); | ||
| 392 | 47 | 50 | ||
| 393 | 48 | std::shared_ptr<graphics::Buffer> alloc_buffer( | 51 | std::shared_ptr<graphics::Buffer> alloc_buffer( |
| 394 | 49 | graphics::BufferProperties const& buffer_properties) override; | 52 | graphics::BufferProperties const& buffer_properties) override; |
| 395 | @@ -61,6 +64,7 @@ | |||
| 396 | 61 | const hw_module_t *hw_module; | 64 | const hw_module_t *hw_module; |
| 397 | 62 | std::shared_ptr<GraphicAllocAdaptor> alloc_device; | 65 | std::shared_ptr<GraphicAllocAdaptor> alloc_device; |
| 398 | 63 | std::shared_ptr<EGLExtensions> const egl_extensions; | 66 | std::shared_ptr<EGLExtensions> const egl_extensions; |
| 399 | 67 | std::shared_ptr<CommandStreamSyncFactory> const cmdstream_sync_factory; | ||
| 400 | 64 | }; | 68 | }; |
| 401 | 65 | 69 | ||
| 402 | 66 | } | 70 | } |
| 403 | 67 | 71 | ||
| 404 | === modified file 'src/platforms/android/server/buffer.cpp' | |||
| 405 | --- src/platforms/android/server/buffer.cpp 2015-08-27 13:41:02 +0000 | |||
| 406 | +++ src/platforms/android/server/buffer.cpp 2015-12-02 16:15:28 +0000 | |||
| 407 | @@ -74,6 +74,18 @@ | |||
| 408 | 74 | void mga::Buffer::gl_bind_to_texture() | 74 | void mga::Buffer::gl_bind_to_texture() |
| 409 | 75 | { | 75 | { |
| 410 | 76 | std::unique_lock<std::mutex> lk(content_lock); | 76 | std::unique_lock<std::mutex> lk(content_lock); |
| 411 | 77 | bind(lk); | ||
| 412 | 78 | secure_for_render(lk); | ||
| 413 | 79 | } | ||
| 414 | 80 | |||
| 415 | 81 | void mga::Buffer::bind() | ||
| 416 | 82 | { | ||
| 417 | 83 | std::unique_lock<std::mutex> lk(content_lock); | ||
| 418 | 84 | bind(lk); | ||
| 419 | 85 | } | ||
| 420 | 86 | |||
| 421 | 87 | void mga::Buffer::bind(std::unique_lock<std::mutex> const&) | ||
| 422 | 88 | { | ||
| 423 | 77 | native_buffer->ensure_available_for(mga::BufferAccess::read); | 89 | native_buffer->ensure_available_for(mga::BufferAccess::read); |
| 424 | 78 | 90 | ||
| 425 | 79 | DispContextPair current | 91 | DispContextPair current |
| 426 | @@ -113,10 +125,6 @@ | |||
| 427 | 113 | } | 125 | } |
| 428 | 114 | 126 | ||
| 429 | 115 | egl_extensions->glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image); | 127 | egl_extensions->glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image); |
| 430 | 116 | |||
| 431 | 117 | //TODO: we should make use of the android egl fence extension here to update the fence. | ||
| 432 | 118 | // if the extension is not available, we should pass out a token that the user | ||
| 433 | 119 | // will have to keep until the completion of the gl draw | ||
| 434 | 120 | } | 128 | } |
| 435 | 121 | 129 | ||
| 436 | 122 | std::shared_ptr<mg::NativeBuffer> mga::Buffer::native_buffer_handle() const | 130 | std::shared_ptr<mg::NativeBuffer> mga::Buffer::native_buffer_handle() const |
| 437 | @@ -196,3 +204,14 @@ | |||
| 438 | 196 | { | 204 | { |
| 439 | 197 | return this; | 205 | return this; |
| 440 | 198 | } | 206 | } |
| 441 | 207 | |||
| 442 | 208 | void mga::Buffer::secure_for_render() | ||
| 443 | 209 | { | ||
| 444 | 210 | std::unique_lock<std::mutex> lk(content_lock); | ||
| 445 | 211 | secure_for_render(lk); | ||
| 446 | 212 | } | ||
| 447 | 213 | |||
| 448 | 214 | void mga::Buffer::secure_for_render(std::unique_lock<std::mutex> const&) | ||
| 449 | 215 | { | ||
| 450 | 216 | native_buffer->lock_for_gpu(); | ||
| 451 | 217 | } | ||
| 452 | 199 | 218 | ||
| 453 | === modified file 'src/platforms/android/server/buffer.h' | |||
| 454 | --- src/platforms/android/server/buffer.h 2015-09-04 06:46:36 +0000 | |||
| 455 | +++ src/platforms/android/server/buffer.h 2015-12-02 16:15:28 +0000 | |||
| 456 | @@ -56,6 +56,10 @@ | |||
| 457 | 56 | geometry::Stride stride() const override; | 56 | geometry::Stride stride() const override; |
| 458 | 57 | MirPixelFormat pixel_format() const override; | 57 | MirPixelFormat pixel_format() const override; |
| 459 | 58 | void gl_bind_to_texture() override; | 58 | void gl_bind_to_texture() override; |
| 460 | 59 | void bind() override; | ||
| 461 | 60 | void secure_for_render() override; | ||
| 462 | 61 | |||
| 463 | 62 | |||
| 464 | 59 | //note, you will get the native representation of an android buffer, including | 63 | //note, you will get the native representation of an android buffer, including |
| 465 | 60 | //the fences associated with the buffer. You must close these fences | 64 | //the fences associated with the buffer. You must close these fences |
| 466 | 61 | std::shared_ptr<NativeBuffer> native_buffer_handle() const override; | 65 | std::shared_ptr<NativeBuffer> native_buffer_handle() const override; |
| 467 | @@ -66,6 +70,8 @@ | |||
| 468 | 66 | NativeBufferBase* native_buffer_base() override; | 70 | NativeBufferBase* native_buffer_base() override; |
| 469 | 67 | 71 | ||
| 470 | 68 | private: | 72 | private: |
| 471 | 73 | void bind(std::unique_lock<std::mutex> const&); | ||
| 472 | 74 | void secure_for_render(std::unique_lock<std::mutex> const&); | ||
| 473 | 69 | gralloc_module_t const* hw_module; | 75 | gralloc_module_t const* hw_module; |
| 474 | 70 | 76 | ||
| 475 | 71 | typedef std::pair<EGLDisplay, EGLContext> DispContextPair; | 77 | typedef std::pair<EGLDisplay, EGLContext> DispContextPair; |
| 476 | 72 | 78 | ||
| 477 | === added file 'src/platforms/android/server/cmdstream_sync_factory.h' | |||
| 478 | --- src/platforms/android/server/cmdstream_sync_factory.h 1970-01-01 00:00:00 +0000 | |||
| 479 | +++ src/platforms/android/server/cmdstream_sync_factory.h 2015-12-02 16:15:28 +0000 | |||
| 480 | @@ -0,0 +1,48 @@ | |||
| 481 | 1 | /* | ||
| 482 | 2 | * Copyright © 2015 Canonical Ltd. | ||
| 483 | 3 | * | ||
| 484 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 485 | 5 | * under the terms of the GNU Lesser General Public License version 3, | ||
| 486 | 6 | * as published by the Free Software Foundation. | ||
| 487 | 7 | * | ||
| 488 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 489 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 490 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 491 | 11 | * GNU Lesser General Public License for more details. | ||
| 492 | 12 | * | ||
| 493 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 494 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 495 | 15 | * | ||
| 496 | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> | ||
| 497 | 17 | */ | ||
| 498 | 18 | |||
| 499 | 19 | #ifndef MIR_GRAPHICS_ANDROID_CMDSTREAM_SYNC_FACTORY_H_ | ||
| 500 | 20 | #define MIR_GRAPHICS_ANDROID_CMDSTREAM_SYNC_FACTORY_H_ | ||
| 501 | 21 | |||
| 502 | 22 | #include <memory> | ||
| 503 | 23 | namespace mir | ||
| 504 | 24 | { | ||
| 505 | 25 | namespace graphics | ||
| 506 | 26 | { | ||
| 507 | 27 | class CommandStreamSync; | ||
| 508 | 28 | namespace android | ||
| 509 | 29 | { | ||
| 510 | 30 | class CommandStreamSyncFactory | ||
| 511 | 31 | { | ||
| 512 | 32 | public: | ||
| 513 | 33 | virtual ~CommandStreamSyncFactory() = default; | ||
| 514 | 34 | virtual std::unique_ptr<CommandStreamSync> create_command_stream_sync() = 0; | ||
| 515 | 35 | protected: | ||
| 516 | 36 | CommandStreamSyncFactory() = default; | ||
| 517 | 37 | CommandStreamSyncFactory(CommandStreamSyncFactory const&) = delete; | ||
| 518 | 38 | CommandStreamSyncFactory& operator=(CommandStreamSyncFactory const&) = delete; | ||
| 519 | 39 | }; | ||
| 520 | 40 | |||
| 521 | 41 | class EGLSyncFactory : public CommandStreamSyncFactory | ||
| 522 | 42 | { | ||
| 523 | 43 | std::unique_ptr<CommandStreamSync> create_command_stream_sync() override; | ||
| 524 | 44 | }; | ||
| 525 | 45 | } | ||
| 526 | 46 | } | ||
| 527 | 47 | } | ||
| 528 | 48 | #endif /* MIR_GRAPHICS_ANDROID_CMDSTREAM_SYNC_FACTORY_H_ */ | ||
| 529 | 0 | 49 | ||
| 530 | === modified file 'src/platforms/android/server/display_component_factory.h' | |||
| 531 | --- src/platforms/android/server/display_component_factory.h 2015-06-17 05:20:42 +0000 | |||
| 532 | +++ src/platforms/android/server/display_component_factory.h 2015-12-02 16:15:28 +0000 | |||
| 533 | @@ -19,6 +19,7 @@ | |||
| 534 | 19 | #ifndef MIR_GRAPHICS_ANDROID_DISPLAY_COMPONENT_FACTORY_H_ | 19 | #ifndef MIR_GRAPHICS_ANDROID_DISPLAY_COMPONENT_FACTORY_H_ |
| 535 | 20 | #define MIR_GRAPHICS_ANDROID_DISPLAY_COMPONENT_FACTORY_H_ | 20 | #define MIR_GRAPHICS_ANDROID_DISPLAY_COMPONENT_FACTORY_H_ |
| 536 | 21 | 21 | ||
| 537 | 22 | #include "mir/graphics/egl_sync_fence.h" | ||
| 538 | 22 | #include "display_device.h" | 23 | #include "display_device.h" |
| 539 | 23 | #include "framebuffer_bundle.h" | 24 | #include "framebuffer_bundle.h" |
| 540 | 24 | #include <memory> | 25 | #include <memory> |
| 541 | @@ -28,6 +29,7 @@ | |||
| 542 | 28 | namespace graphics | 29 | namespace graphics |
| 543 | 29 | { | 30 | { |
| 544 | 30 | class DisplayConfigurationOutput; | 31 | class DisplayConfigurationOutput; |
| 545 | 32 | class CommandStreamSync; | ||
| 546 | 31 | namespace android | 33 | namespace android |
| 547 | 32 | { | 34 | { |
| 548 | 33 | class HwcConfiguration; | 35 | class HwcConfiguration; |
| 549 | 34 | 36 | ||
| 550 | === added file 'src/platforms/android/server/egl_sync_factory.cpp' | |||
| 551 | --- src/platforms/android/server/egl_sync_factory.cpp 1970-01-01 00:00:00 +0000 | |||
| 552 | +++ src/platforms/android/server/egl_sync_factory.cpp 2015-12-02 16:15:28 +0000 | |||
| 553 | @@ -0,0 +1,34 @@ | |||
| 554 | 1 | /* | ||
| 555 | 2 | * Copyright © 2015 Canonical Ltd. | ||
| 556 | 3 | * | ||
| 557 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 558 | 5 | * under the terms of the GNU Lesser General Public License version 3, | ||
| 559 | 6 | * as published by the Free Software Foundation. | ||
| 560 | 7 | * | ||
| 561 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 562 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 563 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 564 | 11 | * GNU Lesser General Public License for more details. | ||
| 565 | 12 | * | ||
| 566 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 567 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 568 | 15 | * | ||
| 569 | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> | ||
| 570 | 17 | */ | ||
| 571 | 18 | |||
| 572 | 19 | #include "cmdstream_sync_factory.h" | ||
| 573 | 20 | #include "mir/graphics/egl_sync_fence.h" | ||
| 574 | 21 | namespace mg = mir::graphics; | ||
| 575 | 22 | namespace mga = mir::graphics::android; | ||
| 576 | 23 | |||
| 577 | 24 | std::unique_ptr<mg::CommandStreamSync> mga::EGLSyncFactory::create_command_stream_sync() | ||
| 578 | 25 | { | ||
| 579 | 26 | try | ||
| 580 | 27 | { | ||
| 581 | 28 | return std::make_unique<EGLSyncFence>(std::make_shared<mg::EGLSyncExtensions>()); | ||
| 582 | 29 | } | ||
| 583 | 30 | catch (std::runtime_error&) | ||
| 584 | 31 | { | ||
| 585 | 32 | return std::make_unique<NullCommandSync>(); | ||
| 586 | 33 | } | ||
| 587 | 34 | } | ||
| 588 | 0 | 35 | ||
| 589 | === modified file 'src/platforms/android/server/hal_component_factory.cpp' | |||
| 590 | --- src/platforms/android/server/hal_component_factory.cpp 2015-06-24 11:33:02 +0000 | |||
| 591 | +++ src/platforms/android/server/hal_component_factory.cpp 2015-12-02 16:15:28 +0000 | |||
| 592 | @@ -65,6 +65,21 @@ | |||
| 593 | 65 | } | 65 | } |
| 594 | 66 | } | 66 | } |
| 595 | 67 | 67 | ||
| 596 | 68 | std::unique_ptr<mg::CommandStreamSync> mga::HalComponentFactory::create_command_stream_sync() | ||
| 597 | 69 | { | ||
| 598 | 70 | if (hwc_version == mga::HwcVersion::hwc10) | ||
| 599 | 71 | return std::make_unique<NullCommandSync>(); | ||
| 600 | 72 | |||
| 601 | 73 | try | ||
| 602 | 74 | { | ||
| 603 | 75 | return std::make_unique<EGLSyncFence>(std::make_shared<mg::EGLSyncExtensions>()); | ||
| 604 | 76 | } | ||
| 605 | 77 | catch (std::runtime_error&) | ||
| 606 | 78 | { | ||
| 607 | 79 | return std::make_unique<NullCommandSync>(); | ||
| 608 | 80 | } | ||
| 609 | 81 | } | ||
| 610 | 82 | |||
| 611 | 68 | std::unique_ptr<mga::FramebufferBundle> mga::HalComponentFactory::create_framebuffers(mg::DisplayConfigurationOutput const& config) | 83 | std::unique_ptr<mga::FramebufferBundle> mga::HalComponentFactory::create_framebuffers(mg::DisplayConfigurationOutput const& config) |
| 612 | 69 | { | 84 | { |
| 613 | 70 | return std::unique_ptr<mga::FramebufferBundle>(new mga::Framebuffers( | 85 | return std::unique_ptr<mga::FramebufferBundle>(new mga::Framebuffers( |
| 614 | 71 | 86 | ||
| 615 | === modified file 'src/platforms/android/server/hal_component_factory.h' | |||
| 616 | --- src/platforms/android/server/hal_component_factory.h 2015-06-24 11:33:02 +0000 | |||
| 617 | +++ src/platforms/android/server/hal_component_factory.h 2015-12-02 16:15:28 +0000 | |||
| 618 | @@ -19,6 +19,7 @@ | |||
| 619 | 19 | #ifndef MIR_GRAPHICS_ANDROID_HAL_COMPONENT_FACTORY_H_ | 19 | #ifndef MIR_GRAPHICS_ANDROID_HAL_COMPONENT_FACTORY_H_ |
| 620 | 20 | #define MIR_GRAPHICS_ANDROID_HAL_COMPONENT_FACTORY_H_ | 20 | #define MIR_GRAPHICS_ANDROID_HAL_COMPONENT_FACTORY_H_ |
| 621 | 21 | 21 | ||
| 622 | 22 | #include "cmdstream_sync_factory.h" | ||
| 623 | 22 | #include "display_component_factory.h" | 23 | #include "display_component_factory.h" |
| 624 | 23 | #include "display_resource_factory.h" | 24 | #include "display_resource_factory.h" |
| 625 | 24 | 25 | ||
| 626 | @@ -39,7 +40,7 @@ | |||
| 627 | 39 | 40 | ||
| 628 | 40 | //NOTE: this should be the only class that inspects the HWC version and assembles | 41 | //NOTE: this should be the only class that inspects the HWC version and assembles |
| 629 | 41 | //the components accordingly | 42 | //the components accordingly |
| 631 | 42 | class HalComponentFactory : public DisplayComponentFactory | 43 | class HalComponentFactory : public DisplayComponentFactory, public CommandStreamSyncFactory |
| 632 | 43 | { | 44 | { |
| 633 | 44 | public: | 45 | public: |
| 634 | 45 | HalComponentFactory( | 46 | HalComponentFactory( |
| 635 | @@ -48,6 +49,7 @@ | |||
| 636 | 48 | std::shared_ptr<HwcReport> const& hwc_report, | 49 | std::shared_ptr<HwcReport> const& hwc_report, |
| 637 | 49 | std::shared_ptr<DeviceQuirks> const& quirks); | 50 | std::shared_ptr<DeviceQuirks> const& quirks); |
| 638 | 50 | 51 | ||
| 639 | 52 | std::unique_ptr<CommandStreamSync> create_command_stream_sync() override; | ||
| 640 | 51 | std::unique_ptr<FramebufferBundle> create_framebuffers(DisplayConfigurationOutput const&) override; | 53 | std::unique_ptr<FramebufferBundle> create_framebuffers(DisplayConfigurationOutput const&) override; |
| 641 | 52 | std::unique_ptr<DisplayDevice> create_display_device() override; | 54 | std::unique_ptr<DisplayDevice> create_display_device() override; |
| 642 | 53 | std::unique_ptr<HwcConfiguration> create_hwc_configuration() override; | 55 | std::unique_ptr<HwcConfiguration> create_hwc_configuration() override; |
| 643 | 54 | 56 | ||
| 644 | === modified file 'src/platforms/android/server/ipc_operations.cpp' | |||
| 645 | --- src/platforms/android/server/ipc_operations.cpp 2015-06-18 14:33:10 +0000 | |||
| 646 | +++ src/platforms/android/server/ipc_operations.cpp 2015-12-02 16:15:28 +0000 | |||
| 647 | @@ -32,6 +32,7 @@ | |||
| 648 | 32 | { | 32 | { |
| 649 | 33 | auto native_buffer = buffer.native_buffer_handle(); | 33 | auto native_buffer = buffer.native_buffer_handle(); |
| 650 | 34 | 34 | ||
| 651 | 35 | native_buffer->wait_for_unlock_by_gpu(); | ||
| 652 | 35 | mir::Fd fence_fd(native_buffer->copy_fence()); | 36 | mir::Fd fence_fd(native_buffer->copy_fence()); |
| 653 | 36 | if (fence_fd != mir::Fd::invalid) | 37 | if (fence_fd != mir::Fd::invalid) |
| 654 | 37 | { | 38 | { |
| 655 | 38 | 39 | ||
| 656 | === modified file 'src/platforms/android/server/platform.cpp' | |||
| 657 | --- src/platforms/android/server/platform.cpp 2015-11-24 12:00:40 +0000 | |||
| 658 | +++ src/platforms/android/server/platform.cpp 2015-12-02 16:15:28 +0000 | |||
| 659 | @@ -85,11 +85,13 @@ | |||
| 660 | 85 | mga::Platform::Platform( | 85 | mga::Platform::Platform( |
| 661 | 86 | std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator, | 86 | std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator, |
| 662 | 87 | std::shared_ptr<mga::DisplayComponentFactory> const& display_buffer_builder, | 87 | std::shared_ptr<mga::DisplayComponentFactory> const& display_buffer_builder, |
| 663 | 88 | std::shared_ptr<CommandStreamSyncFactory> const& sync_factory, | ||
| 664 | 88 | std::shared_ptr<mg::DisplayReport> const& display_report, | 89 | std::shared_ptr<mg::DisplayReport> const& display_report, |
| 665 | 89 | mga::OverlayOptimization overlay_option, | 90 | mga::OverlayOptimization overlay_option, |
| 666 | 90 | std::shared_ptr<mga::DeviceQuirks> const& quirks) : | 91 | std::shared_ptr<mga::DeviceQuirks> const& quirks) : |
| 667 | 91 | buffer_allocator(buffer_allocator), | 92 | buffer_allocator(buffer_allocator), |
| 668 | 92 | display_buffer_builder(display_buffer_builder), | 93 | display_buffer_builder(display_buffer_builder), |
| 669 | 94 | sync_factory(sync_factory), | ||
| 670 | 93 | display_report(display_report), | 95 | display_report(display_report), |
| 671 | 94 | quirks(quirks), | 96 | quirks(quirks), |
| 672 | 95 | overlay_option(overlay_option) | 97 | overlay_option(overlay_option) |
| 673 | @@ -153,10 +155,13 @@ | |||
| 674 | 153 | auto overlay_option = should_use_overlay_optimization(*options); | 155 | auto overlay_option = should_use_overlay_optimization(*options); |
| 675 | 154 | hwc_report->report_overlay_optimization(overlay_option); | 156 | hwc_report->report_overlay_optimization(overlay_option); |
| 676 | 155 | auto display_resource_factory = std::make_shared<mga::ResourceFactory>(); | 157 | auto display_resource_factory = std::make_shared<mga::ResourceFactory>(); |
| 678 | 156 | auto buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(quirks); | 158 | auto sync_factory = std::make_shared<mga::EGLSyncFactory>(); |
| 679 | 159 | auto buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(sync_factory, quirks); | ||
| 680 | 157 | auto component_factory = std::make_shared<mga::HalComponentFactory>( | 160 | auto component_factory = std::make_shared<mga::HalComponentFactory>( |
| 681 | 158 | buffer_allocator, display_resource_factory, hwc_report, quirks); | 161 | buffer_allocator, display_resource_factory, hwc_report, quirks); |
| 683 | 159 | return mir::make_module_ptr<mga::Platform>(buffer_allocator, component_factory, display_report, overlay_option, quirks); | 162 | |
| 684 | 163 | return mir::make_module_ptr<mga::Platform>( | ||
| 685 | 164 | buffer_allocator, component_factory, component_factory, display_report, overlay_option, quirks); | ||
| 686 | 160 | } | 165 | } |
| 687 | 161 | 166 | ||
| 688 | 162 | mir::UniqueModulePtr<mg::Platform> create_guest_platform( | 167 | mir::UniqueModulePtr<mg::Platform> create_guest_platform( |
| 689 | @@ -166,10 +171,11 @@ | |||
| 690 | 166 | mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform); | 171 | mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform); |
| 691 | 167 | //TODO: actually allow disabling quirks for guest platform | 172 | //TODO: actually allow disabling quirks for guest platform |
| 692 | 168 | auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}); | 173 | auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}); |
| 693 | 174 | auto sync_factory = std::make_shared<mga::EGLSyncFactory>(); | ||
| 694 | 169 | //TODO: remove nullptr parameter once platform classes are sorted. | 175 | //TODO: remove nullptr parameter once platform classes are sorted. |
| 695 | 170 | // mg::NativePlatform cannot create a display anyways, so it doesnt need a display builder | 176 | // mg::NativePlatform cannot create a display anyways, so it doesnt need a display builder |
| 698 | 171 | auto const buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(quirks); | 177 | auto const buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(sync_factory, quirks); |
| 699 | 172 | return mir::make_module_ptr<mga::Platform>(buffer_allocator, nullptr, display_report, mga::OverlayOptimization::disabled, quirks); | 178 | return mir::make_module_ptr<mga::Platform>(buffer_allocator, nullptr, sync_factory, display_report, mga::OverlayOptimization::disabled, quirks); |
| 700 | 173 | } | 179 | } |
| 701 | 174 | 180 | ||
| 702 | 175 | void add_graphics_platform_options( | 181 | void add_graphics_platform_options( |
| 703 | 176 | 182 | ||
| 704 | === modified file 'src/platforms/android/server/platform.h' | |||
| 705 | --- src/platforms/android/server/platform.h 2015-11-24 12:00:40 +0000 | |||
| 706 | +++ src/platforms/android/server/platform.h 2015-12-02 16:15:28 +0000 | |||
| 707 | @@ -33,6 +33,7 @@ | |||
| 708 | 33 | class GraphicBufferAllocator; | 33 | class GraphicBufferAllocator; |
| 709 | 34 | class FramebufferFactory; | 34 | class FramebufferFactory; |
| 710 | 35 | class DisplayComponentFactory; | 35 | class DisplayComponentFactory; |
| 711 | 36 | class CommandStreamSyncFactory; | ||
| 712 | 36 | 37 | ||
| 713 | 37 | class Platform : public graphics::Platform | 38 | class Platform : public graphics::Platform |
| 714 | 38 | { | 39 | { |
| 715 | @@ -40,6 +41,7 @@ | |||
| 716 | 40 | Platform( | 41 | Platform( |
| 717 | 41 | std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator, | 42 | std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator, |
| 718 | 42 | std::shared_ptr<DisplayComponentFactory> const& display_buffer_builder, | 43 | std::shared_ptr<DisplayComponentFactory> const& display_buffer_builder, |
| 719 | 44 | std::shared_ptr<CommandStreamSyncFactory> const& sync_factory, | ||
| 720 | 43 | std::shared_ptr<DisplayReport> const& display_report, | 45 | std::shared_ptr<DisplayReport> const& display_report, |
| 721 | 44 | OverlayOptimization overlay_option, | 46 | OverlayOptimization overlay_option, |
| 722 | 45 | std::shared_ptr<DeviceQuirks> const& quirks); | 47 | std::shared_ptr<DeviceQuirks> const& quirks); |
| 723 | @@ -55,6 +57,7 @@ | |||
| 724 | 55 | private: | 57 | private: |
| 725 | 56 | std::shared_ptr<graphics::GraphicBufferAllocator> const buffer_allocator; | 58 | std::shared_ptr<graphics::GraphicBufferAllocator> const buffer_allocator; |
| 726 | 57 | std::shared_ptr<DisplayComponentFactory> const display_buffer_builder; | 59 | std::shared_ptr<DisplayComponentFactory> const display_buffer_builder; |
| 727 | 60 | std::shared_ptr<CommandStreamSyncFactory> const sync_factory; | ||
| 728 | 58 | std::shared_ptr<DisplayReport> const display_report; | 61 | std::shared_ptr<DisplayReport> const display_report; |
| 729 | 59 | std::shared_ptr<PlatformIpcOperations> const ipc_operations; | 62 | std::shared_ptr<PlatformIpcOperations> const ipc_operations; |
| 730 | 60 | std::shared_ptr<DeviceQuirks> const quirks; | 63 | std::shared_ptr<DeviceQuirks> const quirks; |
| 731 | 61 | 64 | ||
| 732 | === modified file 'src/platforms/mesa/server/common/gbm_buffer.cpp' | |||
| 733 | --- src/platforms/mesa/server/common/gbm_buffer.cpp 2015-09-22 09:13:59 +0000 | |||
| 734 | +++ src/platforms/mesa/server/common/gbm_buffer.cpp 2015-12-02 16:15:28 +0000 | |||
| 735 | @@ -197,3 +197,12 @@ | |||
| 736 | 197 | { | 197 | { |
| 737 | 198 | return this; | 198 | return this; |
| 738 | 199 | } | 199 | } |
| 739 | 200 | |||
| 740 | 201 | void mgm::GBMBuffer::secure_for_render() | ||
| 741 | 202 | { | ||
| 742 | 203 | } | ||
| 743 | 204 | |||
| 744 | 205 | void mgm::GBMBuffer::bind() | ||
| 745 | 206 | { | ||
| 746 | 207 | gl_bind_to_texture(); | ||
| 747 | 208 | } | ||
| 748 | 200 | 209 | ||
| 749 | === modified file 'src/platforms/mesa/server/common/gbm_buffer.h' | |||
| 750 | --- src/platforms/mesa/server/common/gbm_buffer.h 2015-09-04 06:46:36 +0000 | |||
| 751 | +++ src/platforms/mesa/server/common/gbm_buffer.h 2015-12-02 16:15:28 +0000 | |||
| 752 | @@ -67,6 +67,8 @@ | |||
| 753 | 67 | virtual std::shared_ptr<MirNativeBuffer> native_buffer_handle() const override; | 67 | virtual std::shared_ptr<MirNativeBuffer> native_buffer_handle() const override; |
| 754 | 68 | 68 | ||
| 755 | 69 | virtual void gl_bind_to_texture() override; | 69 | virtual void gl_bind_to_texture() override; |
| 756 | 70 | virtual void bind() override; | ||
| 757 | 71 | virtual void secure_for_render() override; | ||
| 758 | 70 | 72 | ||
| 759 | 71 | void write(unsigned char const* pixels, size_t size) override; | 73 | void write(unsigned char const* pixels, size_t size) override; |
| 760 | 72 | void read(std::function<void(unsigned char const*)> const& do_with_pixels) override; | 74 | void read(std::function<void(unsigned char const*)> const& do_with_pixels) override; |
| 761 | 73 | 75 | ||
| 762 | === modified file 'src/platforms/mesa/server/common/shm_buffer.cpp' | |||
| 763 | --- src/platforms/mesa/server/common/shm_buffer.cpp 2015-08-27 13:41:02 +0000 | |||
| 764 | +++ src/platforms/mesa/server/common/shm_buffer.cpp 2015-12-02 16:15:28 +0000 | |||
| 765 | @@ -176,3 +176,12 @@ | |||
| 766 | 176 | { | 176 | { |
| 767 | 177 | return this; | 177 | return this; |
| 768 | 178 | } | 178 | } |
| 769 | 179 | |||
| 770 | 180 | void mgm::ShmBuffer::bind() | ||
| 771 | 181 | { | ||
| 772 | 182 | gl_bind_to_texture(); | ||
| 773 | 183 | } | ||
| 774 | 184 | |||
| 775 | 185 | void mgm::ShmBuffer::secure_for_render() | ||
| 776 | 186 | { | ||
| 777 | 187 | } | ||
| 778 | 179 | 188 | ||
| 779 | === modified file 'src/platforms/mesa/server/common/shm_buffer.h' | |||
| 780 | --- src/platforms/mesa/server/common/shm_buffer.h 2015-09-04 06:46:36 +0000 | |||
| 781 | +++ src/platforms/mesa/server/common/shm_buffer.h 2015-12-02 16:15:28 +0000 | |||
| 782 | @@ -51,6 +51,8 @@ | |||
| 783 | 51 | MirPixelFormat pixel_format() const override; | 51 | MirPixelFormat pixel_format() const override; |
| 784 | 52 | std::shared_ptr<MirNativeBuffer> native_buffer_handle() const override; | 52 | std::shared_ptr<MirNativeBuffer> native_buffer_handle() const override; |
| 785 | 53 | void gl_bind_to_texture() override; | 53 | void gl_bind_to_texture() override; |
| 786 | 54 | void bind() override; | ||
| 787 | 55 | void secure_for_render() override; | ||
| 788 | 54 | void write(unsigned char const* data, size_t size) override; | 56 | void write(unsigned char const* data, size_t size) override; |
| 789 | 55 | void read(std::function<void(unsigned char const*)> const& do_with_pixels) override; | 57 | void read(std::function<void(unsigned char const*)> const& do_with_pixels) override; |
| 790 | 56 | NativeBufferBase* native_buffer_base() override; | 58 | NativeBufferBase* native_buffer_base() override; |
| 791 | 57 | 59 | ||
| 792 | === modified file 'tests/include/mir/test/doubles/mock_android_native_buffer.h' | |||
| 793 | --- tests/include/mir/test/doubles/mock_android_native_buffer.h 2015-06-17 05:20:42 +0000 | |||
| 794 | +++ tests/include/mir/test/doubles/mock_android_native_buffer.h 2015-12-02 16:15:28 +0000 | |||
| 795 | @@ -57,6 +57,8 @@ | |||
| 796 | 57 | MOCK_METHOD1(ensure_available_for, void(graphics::android::BufferAccess)); | 57 | MOCK_METHOD1(ensure_available_for, void(graphics::android::BufferAccess)); |
| 797 | 58 | MOCK_METHOD2(update_usage, void(graphics::android::NativeFence&, graphics::android::BufferAccess)); | 58 | MOCK_METHOD2(update_usage, void(graphics::android::NativeFence&, graphics::android::BufferAccess)); |
| 798 | 59 | 59 | ||
| 799 | 60 | MOCK_METHOD0(lock_for_gpu, void()); | ||
| 800 | 61 | MOCK_METHOD0(wait_for_unlock_by_gpu, void()); | ||
| 801 | 60 | ANativeWindowBuffer stub_anwb; | 62 | ANativeWindowBuffer stub_anwb; |
| 802 | 61 | native_handle_t native_handle; | 63 | native_handle_t native_handle; |
| 803 | 62 | }; | 64 | }; |
| 804 | 63 | 65 | ||
| 805 | === modified file 'tests/include/mir/test/doubles/mock_buffer.h' | |||
| 806 | --- tests/include/mir/test/doubles/mock_buffer.h 2015-09-01 10:49:48 +0000 | |||
| 807 | +++ tests/include/mir/test/doubles/mock_buffer.h 2015-12-02 16:15:28 +0000 | |||
| 808 | @@ -72,6 +72,7 @@ | |||
| 809 | 72 | MOCK_METHOD2(write, void(unsigned char const*, size_t)); | 72 | MOCK_METHOD2(write, void(unsigned char const*, size_t)); |
| 810 | 73 | MOCK_METHOD1(read, void(std::function<void(unsigned char const*)> const&)); | 73 | MOCK_METHOD1(read, void(std::function<void(unsigned char const*)> const&)); |
| 811 | 74 | MOCK_METHOD0(native_buffer_base, graphics::NativeBufferBase*()); | 74 | MOCK_METHOD0(native_buffer_base, graphics::NativeBufferBase*()); |
| 812 | 75 | MOCK_METHOD0(used_as_texture, void()); | ||
| 813 | 75 | }; | 76 | }; |
| 814 | 76 | 77 | ||
| 815 | 77 | } | 78 | } |
| 816 | 78 | 79 | ||
| 817 | === modified file 'tests/include/mir/test/doubles/mock_gl_buffer.h' | |||
| 818 | --- tests/include/mir/test/doubles/mock_gl_buffer.h 2015-09-04 06:46:36 +0000 | |||
| 819 | +++ tests/include/mir/test/doubles/mock_gl_buffer.h 2015-12-02 16:15:28 +0000 | |||
| 820 | @@ -36,6 +36,8 @@ | |||
| 821 | 36 | using MockBuffer::MockBuffer; | 36 | using MockBuffer::MockBuffer; |
| 822 | 37 | 37 | ||
| 823 | 38 | MOCK_METHOD0(gl_bind_to_texture, void()); | 38 | MOCK_METHOD0(gl_bind_to_texture, void()); |
| 824 | 39 | MOCK_METHOD0(secure_for_render, void()); | ||
| 825 | 40 | MOCK_METHOD0(bind, void()); | ||
| 826 | 39 | }; | 41 | }; |
| 827 | 40 | 42 | ||
| 828 | 41 | } | 43 | } |
| 829 | 42 | 44 | ||
| 830 | === modified file 'tests/include/mir/test/doubles/stub_android_native_buffer.h' | |||
| 831 | --- tests/include/mir/test/doubles/stub_android_native_buffer.h 2015-05-29 17:53:49 +0000 | |||
| 832 | +++ tests/include/mir/test/doubles/stub_android_native_buffer.h 2015-12-02 16:15:28 +0000 | |||
| 833 | @@ -47,6 +47,9 @@ | |||
| 834 | 47 | void ensure_available_for(graphics::android::BufferAccess) {} | 47 | void ensure_available_for(graphics::android::BufferAccess) {} |
| 835 | 48 | void update_usage(graphics::android::NativeFence&, graphics::android::BufferAccess) {} | 48 | void update_usage(graphics::android::NativeFence&, graphics::android::BufferAccess) {} |
| 836 | 49 | 49 | ||
| 837 | 50 | void lock_for_gpu() {}; | ||
| 838 | 51 | void wait_for_unlock_by_gpu() {}; | ||
| 839 | 52 | |||
| 840 | 50 | ANativeWindowBuffer stub_anwb; | 53 | ANativeWindowBuffer stub_anwb; |
| 841 | 51 | native_handle_t native_handle; | 54 | native_handle_t native_handle; |
| 842 | 52 | }; | 55 | }; |
| 843 | 53 | 56 | ||
| 844 | === added file 'tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h' | |||
| 845 | --- tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h 1970-01-01 00:00:00 +0000 | |||
| 846 | +++ tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h 2015-12-02 16:15:28 +0000 | |||
| 847 | @@ -0,0 +1,41 @@ | |||
| 848 | 1 | /* | ||
| 849 | 2 | * Copyright © 2015 Canonical Ltd. | ||
| 850 | 3 | * | ||
| 851 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 852 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 853 | 6 | * as published by the Free Software Foundation. | ||
| 854 | 7 | * | ||
| 855 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 856 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 857 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 858 | 11 | * GNU General Public License for more details. | ||
| 859 | 12 | * | ||
| 860 | 13 | * You should have received a copy of the GNU General Public License | ||
| 861 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 862 | 15 | * | ||
| 863 | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> | ||
| 864 | 17 | */ | ||
| 865 | 18 | |||
| 866 | 19 | #ifndef MIR_TEST_DOUBLES_STUB_CMDSTREAM_SYNC_FACTORY_H_ | ||
| 867 | 20 | #define MIR_TEST_DOUBLES_STUB_CMDSTREAM_SYNC_FACTORY_H_ | ||
| 868 | 21 | |||
| 869 | 22 | #include "src/platforms/android/server/cmdstream_sync_factory.h" | ||
| 870 | 23 | |||
| 871 | 24 | namespace mir | ||
| 872 | 25 | { | ||
| 873 | 26 | namespace test | ||
| 874 | 27 | { | ||
| 875 | 28 | namespace doubles | ||
| 876 | 29 | { | ||
| 877 | 30 | struct StubCmdStreamSyncFactory : graphics::android::CommandStreamSyncFactory | ||
| 878 | 31 | { | ||
| 879 | 32 | std::unique_ptr<graphics::CommandStreamSync> create_command_stream_sync() override | ||
| 880 | 33 | { | ||
| 881 | 34 | return std::make_unique<graphics::NullCommandSync>(); | ||
| 882 | 35 | } | ||
| 883 | 36 | }; | ||
| 884 | 37 | } | ||
| 885 | 38 | } | ||
| 886 | 39 | } | ||
| 887 | 40 | |||
| 888 | 41 | #endif /* MIR_TEST_DOUBLES_STUB_CMDSTREAM_SYNC_FACTORY_H_ */ | ||
| 889 | 0 | 42 | ||
| 890 | === modified file 'tests/include/mir/test/doubles/stub_display_builder.h' | |||
| 891 | --- tests/include/mir/test/doubles/stub_display_builder.h 2015-11-18 15:03:00 +0000 | |||
| 892 | +++ tests/include/mir/test/doubles/stub_display_builder.h 2015-12-02 16:15:28 +0000 | |||
| 893 | @@ -126,6 +126,11 @@ | |||
| 894 | 126 | config = std::move(mock_config); | 126 | config = std::move(mock_config); |
| 895 | 127 | } | 127 | } |
| 896 | 128 | 128 | ||
| 897 | 129 | std::unique_ptr<graphics::CommandStreamSync> create_command_stream_sync() | ||
| 898 | 130 | { | ||
| 899 | 131 | return std::make_unique<graphics::NullCommandSync>(); | ||
| 900 | 132 | } | ||
| 901 | 133 | |||
| 902 | 129 | geometry::Size sz; | 134 | geometry::Size sz; |
| 903 | 130 | std::unique_ptr<graphics::android::HwcConfiguration> config; | 135 | std::unique_ptr<graphics::android::HwcConfiguration> config; |
| 904 | 131 | }; | 136 | }; |
| 905 | 132 | 137 | ||
| 906 | === modified file 'tests/include/mir/test/doubles/stub_gl_buffer.h' | |||
| 907 | --- tests/include/mir/test/doubles/stub_gl_buffer.h 2015-09-04 06:46:36 +0000 | |||
| 908 | +++ tests/include/mir/test/doubles/stub_gl_buffer.h 2015-12-02 16:15:28 +0000 | |||
| 909 | @@ -36,6 +36,8 @@ | |||
| 910 | 36 | using StubBuffer::StubBuffer; | 36 | using StubBuffer::StubBuffer; |
| 911 | 37 | 37 | ||
| 912 | 38 | void gl_bind_to_texture() {} | 38 | void gl_bind_to_texture() {} |
| 913 | 39 | void bind() {} | ||
| 914 | 40 | void secure_for_render() {} | ||
| 915 | 39 | }; | 41 | }; |
| 916 | 40 | 42 | ||
| 917 | 41 | } | 43 | } |
| 918 | 42 | 44 | ||
| 919 | === modified file 'tests/integration-tests/graphics/mesa/test_buffer_integration.cpp' | |||
| 920 | --- tests/integration-tests/graphics/mesa/test_buffer_integration.cpp 2015-11-02 21:56:56 +0000 | |||
| 921 | +++ tests/integration-tests/graphics/mesa/test_buffer_integration.cpp 2015-12-02 16:15:28 +0000 | |||
| 922 | @@ -77,6 +77,9 @@ | |||
| 923 | 77 | } | 77 | } |
| 924 | 78 | } | 78 | } |
| 925 | 79 | 79 | ||
| 926 | 80 | void bind() override { gl_bind_to_texture(); } | ||
| 927 | 81 | void secure_for_render() override {} | ||
| 928 | 82 | |||
| 929 | 80 | private: | 83 | private: |
| 930 | 81 | std::thread::id creation_thread_id; | 84 | std::thread::id creation_thread_id; |
| 931 | 82 | }; | 85 | }; |
| 932 | 83 | 86 | ||
| 933 | === modified file 'tests/unit-tests/gl/test_gl_texture_cache.cpp' | |||
| 934 | --- tests/unit-tests/gl/test_gl_texture_cache.cpp 2015-10-06 02:30:52 +0000 | |||
| 935 | +++ tests/unit-tests/gl/test_gl_texture_cache.cpp 2015-12-02 16:15:28 +0000 | |||
| 936 | @@ -17,7 +17,7 @@ | |||
| 937 | 17 | * Originally by: Daniel van Vugt <daniel.van.vugt@canonical.com> | 17 | * Originally by: Daniel van Vugt <daniel.van.vugt@canonical.com> |
| 938 | 18 | */ | 18 | */ |
| 939 | 19 | 19 | ||
| 941 | 20 | #include "mir/gl/recently_used_cache.h" | 20 | #include "src/gl/recently_used_cache.h" |
| 942 | 21 | #include "mir/test/doubles/mock_gl_buffer.h" | 21 | #include "mir/test/doubles/mock_gl_buffer.h" |
| 943 | 22 | #include "mir/test/doubles/mock_renderable.h" | 22 | #include "mir/test/doubles/mock_renderable.h" |
| 944 | 23 | #include "mir/test/doubles/mock_gl.h" | 23 | #include "mir/test/doubles/mock_gl.h" |
| 945 | @@ -75,6 +75,7 @@ | |||
| 946 | 75 | EXPECT_CALL(mock_gl, glBindTexture(GL_TEXTURE_2D, stub_texture)); | 75 | EXPECT_CALL(mock_gl, glBindTexture(GL_TEXTURE_2D, stub_texture)); |
| 947 | 76 | EXPECT_CALL(*mock_buffer,gl_bind_to_texture()) | 76 | EXPECT_CALL(*mock_buffer,gl_bind_to_texture()) |
| 948 | 77 | .Times(0); | 77 | .Times(0); |
| 949 | 78 | EXPECT_CALL(*mock_buffer, used_as_texture()); | ||
| 950 | 78 | 79 | ||
| 951 | 79 | // Frame 3: Texture found in cache but refreshed with new buffer | 80 | // Frame 3: Texture found in cache but refreshed with new buffer |
| 952 | 80 | EXPECT_CALL(*mock_buffer, id()) | 81 | EXPECT_CALL(*mock_buffer, id()) |
| 953 | @@ -92,6 +93,7 @@ | |||
| 954 | 92 | EXPECT_CALL(*mock_buffer, id()) | 93 | EXPECT_CALL(*mock_buffer, id()) |
| 955 | 93 | .WillOnce(Return(mg::BufferID(456))); | 94 | .WillOnce(Return(mg::BufferID(456))); |
| 956 | 94 | EXPECT_CALL(mock_gl, glBindTexture(GL_TEXTURE_2D, stub_texture)); | 95 | EXPECT_CALL(mock_gl, glBindTexture(GL_TEXTURE_2D, stub_texture)); |
| 957 | 96 | EXPECT_CALL(*mock_buffer, used_as_texture()); | ||
| 958 | 95 | 97 | ||
| 959 | 96 | EXPECT_CALL(mock_gl, glDeleteTextures(1, Pointee(stub_texture))); | 98 | EXPECT_CALL(mock_gl, glDeleteTextures(1, Pointee(stub_texture))); |
| 960 | 97 | 99 | ||
| 961 | 98 | 100 | ||
| 962 | === modified file 'tests/unit-tests/gl/test_program_factory.cpp' | |||
| 963 | --- tests/unit-tests/gl/test_program_factory.cpp 2015-10-06 02:30:52 +0000 | |||
| 964 | +++ tests/unit-tests/gl/test_program_factory.cpp 2015-12-02 16:15:28 +0000 | |||
| 965 | @@ -24,7 +24,7 @@ | |||
| 966 | 24 | #include <gtest/gtest.h> | 24 | #include <gtest/gtest.h> |
| 967 | 25 | #include <gmock/gmock.h> | 25 | #include <gmock/gmock.h> |
| 968 | 26 | #include <mir/geometry/rectangle.h> | 26 | #include <mir/geometry/rectangle.h> |
| 970 | 27 | #include "src/gl/default_program_factory.h" | 27 | #include "mir/gl/default_program_factory.h" |
| 971 | 28 | #include <mir/test/fake_shared.h> | 28 | #include <mir/test/fake_shared.h> |
| 972 | 29 | #include <mir/test/doubles/mock_buffer.h> | 29 | #include <mir/test/doubles/mock_buffer.h> |
| 973 | 30 | #include <mir/test/doubles/mock_renderable.h> | 30 | #include <mir/test/doubles/mock_renderable.h> |
| 974 | 31 | 31 | ||
| 975 | === modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp' | |||
| 976 | --- tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp 2015-08-07 15:55:22 +0000 | |||
| 977 | +++ tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp 2015-12-02 16:15:28 +0000 | |||
| 978 | @@ -17,11 +17,13 @@ | |||
| 979 | 17 | */ | 17 | */ |
| 980 | 18 | 18 | ||
| 981 | 19 | #include "src/platforms/android/server/android_alloc_adaptor.h" | 19 | #include "src/platforms/android/server/android_alloc_adaptor.h" |
| 982 | 20 | #include "src/platforms/android/server/cmdstream_sync_factory.h" | ||
| 983 | 20 | #include "src/platforms/android/server/device_quirks.h" | 21 | #include "src/platforms/android/server/device_quirks.h" |
| 984 | 21 | #include "mir/graphics/android/native_buffer.h" | 22 | #include "mir/graphics/android/native_buffer.h" |
| 985 | 22 | 23 | ||
| 986 | 23 | #include "mir/test/doubles/mock_android_alloc_device.h" | 24 | #include "mir/test/doubles/mock_android_alloc_device.h" |
| 987 | 24 | #include "mir/test/doubles/mock_alloc_adaptor.h" | 25 | #include "mir/test/doubles/mock_alloc_adaptor.h" |
| 988 | 26 | #include "mir/test/doubles/mock_egl.h" | ||
| 989 | 25 | 27 | ||
| 990 | 26 | #include <gtest/gtest.h> | 28 | #include <gtest/gtest.h> |
| 991 | 27 | #include <gmock/gmock.h> | 29 | #include <gmock/gmock.h> |
| 992 | @@ -32,7 +34,6 @@ | |||
| 993 | 32 | namespace geom = mir::geometry; | 34 | namespace geom = mir::geometry; |
| 994 | 33 | namespace mtd = mir::test::doubles; | 35 | namespace mtd = mir::test::doubles; |
| 995 | 34 | 36 | ||
| 996 | 35 | |||
| 997 | 36 | class AdaptorICSTest : public ::testing::Test | 37 | class AdaptorICSTest : public ::testing::Test |
| 998 | 37 | { | 38 | { |
| 999 | 38 | public: | 39 | public: |
| 1000 | @@ -48,13 +49,15 @@ | |||
| 1001 | 48 | mock_alloc_device = std::make_shared<NiceMock<mtd::MockAllocDevice>>(); | 49 | mock_alloc_device = std::make_shared<NiceMock<mtd::MockAllocDevice>>(); |
| 1002 | 49 | 50 | ||
| 1003 | 50 | auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}); | 51 | auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}); |
| 1005 | 51 | alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device, quirks); | 52 | alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device, sync_factory, quirks); |
| 1006 | 52 | 53 | ||
| 1007 | 53 | pf = mir_pixel_format_abgr_8888; | 54 | pf = mir_pixel_format_abgr_8888; |
| 1008 | 54 | size = geom::Size{300, 200}; | 55 | size = geom::Size{300, 200}; |
| 1009 | 55 | usage = mga::BufferUsage::use_hardware; | 56 | usage = mga::BufferUsage::use_hardware; |
| 1010 | 56 | } | 57 | } |
| 1011 | 57 | 58 | ||
| 1012 | 59 | mtd::MockEGL mock_egl; | ||
| 1013 | 60 | std::shared_ptr<mga::CommandStreamSyncFactory> sync_factory{std::make_shared<mga::EGLSyncFactory>()}; | ||
| 1014 | 58 | std::shared_ptr<mtd::MockAllocDevice> mock_alloc_device; | 61 | std::shared_ptr<mtd::MockAllocDevice> mock_alloc_device; |
| 1015 | 59 | std::shared_ptr<mga::AndroidAllocAdaptor> alloc_adaptor; | 62 | std::shared_ptr<mga::AndroidAllocAdaptor> alloc_adaptor; |
| 1016 | 60 | 63 | ||
| 1017 | 61 | 64 | ||
| 1018 | === modified file 'tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp' | |||
| 1019 | --- tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp 2015-08-07 15:55:22 +0000 | |||
| 1020 | +++ tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp 2015-12-02 16:15:28 +0000 | |||
| 1021 | @@ -23,6 +23,8 @@ | |||
| 1022 | 23 | #include "mir/graphics/buffer.h" | 23 | #include "mir/graphics/buffer.h" |
| 1023 | 24 | #include "mir/graphics/android/native_buffer.h" | 24 | #include "mir/graphics/android/native_buffer.h" |
| 1024 | 25 | 25 | ||
| 1025 | 26 | #include "mir/test/doubles/stub_display_builder.h" | ||
| 1026 | 27 | #include "mir/test/doubles/stub_cmdstream_sync_factory.h" | ||
| 1027 | 26 | #include "mir/test/doubles/mock_egl.h" | 28 | #include "mir/test/doubles/mock_egl.h" |
| 1028 | 27 | 29 | ||
| 1029 | 28 | #include <hardware/gralloc.h> | 30 | #include <hardware/gralloc.h> |
| 1030 | @@ -43,7 +45,9 @@ | |||
| 1031 | 43 | 45 | ||
| 1032 | 44 | testing::NiceMock<mtd::HardwareAccessMock> hw_access_mock; | 46 | testing::NiceMock<mtd::HardwareAccessMock> hw_access_mock; |
| 1033 | 45 | testing::NiceMock<mtd::MockEGL> mock_egl; | 47 | testing::NiceMock<mtd::MockEGL> mock_egl; |
| 1035 | 46 | mga::AndroidGraphicBufferAllocator allocator{std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{})}; | 48 | mga::AndroidGraphicBufferAllocator allocator{ |
| 1036 | 49 | std::make_shared<mtd::StubCmdStreamSyncFactory>(), | ||
| 1037 | 50 | std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{})}; | ||
| 1038 | 47 | }; | 51 | }; |
| 1039 | 48 | 52 | ||
| 1040 | 49 | TEST_F(AndroidGraphicBufferAllocatorTest, allocator_accesses_gralloc_module) | 53 | TEST_F(AndroidGraphicBufferAllocatorTest, allocator_accesses_gralloc_module) |
| 1041 | @@ -54,7 +58,7 @@ | |||
| 1042 | 54 | .Times(1); | 58 | .Times(1); |
| 1043 | 55 | 59 | ||
| 1044 | 56 | auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}); | 60 | auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}); |
| 1046 | 57 | mga::AndroidGraphicBufferAllocator allocator{quirks}; | 61 | mga::AndroidGraphicBufferAllocator allocator{std::make_shared<mtd::StubCmdStreamSyncFactory>(), quirks}; |
| 1047 | 58 | } | 62 | } |
| 1048 | 59 | 63 | ||
| 1049 | 60 | TEST_F(AndroidGraphicBufferAllocatorTest, supported_pixel_formats_contain_common_formats) | 64 | TEST_F(AndroidGraphicBufferAllocatorTest, supported_pixel_formats_contain_common_formats) |
| 1050 | 61 | 65 | ||
| 1051 | === modified file 'tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp' | |||
| 1052 | --- tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp 2015-06-25 03:00:08 +0000 | |||
| 1053 | +++ tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp 2015-12-02 16:15:28 +0000 | |||
| 1054 | @@ -289,7 +289,7 @@ | |||
| 1055 | 289 | 289 | ||
| 1056 | 290 | 290 | ||
| 1057 | 291 | /* binding tests */ | 291 | /* binding tests */ |
| 1059 | 292 | TEST_F(AndroidBufferBinding, buffer_calls_binding_extension) | 292 | TEST_F(AndroidBufferBinding, buffer_calls_binding_extension_and_notes_gpu_usage) |
| 1060 | 293 | { | 293 | { |
| 1061 | 294 | using namespace testing; | 294 | using namespace testing; |
| 1062 | 295 | EXPECT_CALL(mock_egl, glEGLImageTargetTexture2DOES(_, _)) | 295 | EXPECT_CALL(mock_egl, glEGLImageTargetTexture2DOES(_, _)) |
| 1063 | @@ -298,11 +298,23 @@ | |||
| 1064 | 298 | buffer.gl_bind_to_texture(); | 298 | buffer.gl_bind_to_texture(); |
| 1065 | 299 | } | 299 | } |
| 1066 | 300 | 300 | ||
| 1067 | 301 | TEST_F(AndroidBufferBinding, notes_gpu_usage_when_explicity_told) | ||
| 1068 | 302 | { | ||
| 1069 | 303 | using namespace testing; | ||
| 1070 | 304 | EXPECT_CALL(mock_egl, glEGLImageTargetTexture2DOES(_, _)) | ||
| 1071 | 305 | .Times(0); | ||
| 1072 | 306 | EXPECT_CALL(*mock_native_buffer, lock_for_gpu()); | ||
| 1073 | 307 | mga::Buffer buffer(gralloc, mock_native_buffer, extensions); | ||
| 1074 | 308 | buffer.secure_for_render(); | ||
| 1075 | 309 | } | ||
| 1076 | 310 | |||
| 1077 | 301 | TEST_F(AndroidBufferBinding, buffer_calls_binding_extension_every_time) | 311 | TEST_F(AndroidBufferBinding, buffer_calls_binding_extension_every_time) |
| 1078 | 302 | { | 312 | { |
| 1079 | 303 | using namespace testing; | 313 | using namespace testing; |
| 1080 | 304 | EXPECT_CALL(mock_egl, glEGLImageTargetTexture2DOES(_, _)) | 314 | EXPECT_CALL(mock_egl, glEGLImageTargetTexture2DOES(_, _)) |
| 1081 | 305 | .Times(Exactly(3)); | 315 | .Times(Exactly(3)); |
| 1082 | 316 | EXPECT_CALL(*mock_native_buffer, lock_for_gpu()) | ||
| 1083 | 317 | .Times(Exactly(3)); | ||
| 1084 | 306 | 318 | ||
| 1085 | 307 | mga::Buffer buffer(gralloc, mock_native_buffer, extensions); | 319 | mga::Buffer buffer(gralloc, mock_native_buffer, extensions); |
| 1086 | 308 | buffer.gl_bind_to_texture(); | 320 | buffer.gl_bind_to_texture(); |
| 1087 | 309 | 321 | ||
| 1088 | === modified file 'tests/unit-tests/graphics/android/test_display_hotplug.cpp' | |||
| 1089 | --- tests/unit-tests/graphics/android/test_display_hotplug.cpp 2015-10-06 02:30:52 +0000 | |||
| 1090 | +++ tests/unit-tests/graphics/android/test_display_hotplug.cpp 2015-12-02 16:15:28 +0000 | |||
| 1091 | @@ -103,6 +103,11 @@ | |||
| 1092 | 103 | new mga::LayerList(std::make_shared<mga::IntegerSourceCrop>(), {}, geom::Displacement{})); | 103 | new mga::LayerList(std::make_shared<mga::IntegerSourceCrop>(), {}, geom::Displacement{})); |
| 1093 | 104 | } | 104 | } |
| 1094 | 105 | 105 | ||
| 1095 | 106 | std::unique_ptr<mg::CommandStreamSync> create_command_stream_sync() | ||
| 1096 | 107 | { | ||
| 1097 | 108 | return nullptr; | ||
| 1098 | 109 | } | ||
| 1099 | 110 | |||
| 1100 | 106 | StubHwcConfig stub_config; | 111 | StubHwcConfig stub_config; |
| 1101 | 107 | }; | 112 | }; |
| 1102 | 108 | 113 | ||
| 1103 | 109 | 114 | ||
| 1104 | === modified file 'tests/unit-tests/graphics/android/test_native_buffer.cpp' | |||
| 1105 | --- tests/unit-tests/graphics/android/test_native_buffer.cpp 2015-06-25 03:00:08 +0000 | |||
| 1106 | +++ tests/unit-tests/graphics/android/test_native_buffer.cpp 2015-12-02 16:15:28 +0000 | |||
| 1107 | @@ -17,25 +17,41 @@ | |||
| 1108 | 17 | */ | 17 | */ |
| 1109 | 18 | 18 | ||
| 1110 | 19 | #include "mir/graphics/android/android_native_buffer.h" | 19 | #include "mir/graphics/android/android_native_buffer.h" |
| 1111 | 20 | #include "mir/graphics/egl_sync_fence.h" | ||
| 1112 | 20 | #include "mir/test/doubles/mock_fence.h" | 21 | #include "mir/test/doubles/mock_fence.h" |
| 1113 | 21 | #include <memory> | 22 | #include <memory> |
| 1114 | 22 | #include <gtest/gtest.h> | 23 | #include <gtest/gtest.h> |
| 1115 | 23 | 24 | ||
| 1116 | 24 | namespace mtd=mir::test::doubles; | 25 | namespace mtd=mir::test::doubles; |
| 1117 | 25 | namespace mga=mir::graphics::android; | 26 | namespace mga=mir::graphics::android; |
| 1118 | 27 | using namespace testing; | ||
| 1119 | 28 | |||
| 1120 | 29 | namespace | ||
| 1121 | 30 | { | ||
| 1122 | 31 | struct MockCommandStreamSync : public mir::graphics::CommandStreamSync | ||
| 1123 | 32 | { | ||
| 1124 | 33 | MOCK_METHOD0(raise, void()); | ||
| 1125 | 34 | MOCK_METHOD0(reset, void()); | ||
| 1126 | 35 | MOCK_METHOD1(wait_for, bool(std::chrono::nanoseconds)); | ||
| 1127 | 36 | }; | ||
| 1128 | 37 | } | ||
| 1129 | 26 | 38 | ||
| 1130 | 27 | struct NativeBuffer : public testing::Test | 39 | struct NativeBuffer : public testing::Test |
| 1131 | 28 | { | 40 | { |
| 1132 | 29 | NativeBuffer() : | 41 | NativeBuffer() : |
| 1133 | 30 | a_native_window_buffer(std::make_shared<ANativeWindowBuffer>()), | 42 | a_native_window_buffer(std::make_shared<ANativeWindowBuffer>()), |
| 1134 | 31 | mock_fence(std::make_shared<testing::NiceMock<mtd::MockFence>>()), | 43 | mock_fence(std::make_shared<testing::NiceMock<mtd::MockFence>>()), |
| 1136 | 32 | fake_fd{48484} | 44 | fake_fd{48484}, |
| 1137 | 45 | timeout{std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::seconds(2))}, | ||
| 1138 | 46 | mock_cmdstream_sync{std::make_shared<MockCommandStreamSync>()} | ||
| 1139 | 33 | { | 47 | { |
| 1140 | 34 | } | 48 | } |
| 1141 | 35 | 49 | ||
| 1142 | 36 | std::shared_ptr<ANativeWindowBuffer> a_native_window_buffer; | 50 | std::shared_ptr<ANativeWindowBuffer> a_native_window_buffer; |
| 1143 | 37 | std::shared_ptr<mtd::MockFence> mock_fence; | 51 | std::shared_ptr<mtd::MockFence> mock_fence; |
| 1144 | 38 | int fake_fd; | 52 | int fake_fd; |
| 1145 | 53 | std::chrono::nanoseconds timeout; | ||
| 1146 | 54 | std::shared_ptr<MockCommandStreamSync> mock_cmdstream_sync; | ||
| 1147 | 39 | }; | 55 | }; |
| 1148 | 40 | 56 | ||
| 1149 | 41 | TEST_F(NativeBuffer, extends_lifetime_when_driver_calls_external_refcount_hooks) | 57 | TEST_F(NativeBuffer, extends_lifetime_when_driver_calls_external_refcount_hooks) |
| 1150 | @@ -88,7 +104,7 @@ | |||
| 1151 | 88 | { | 104 | { |
| 1152 | 89 | EXPECT_CALL(*mock_fence, wait()) | 105 | EXPECT_CALL(*mock_fence, wait()) |
| 1153 | 90 | .Times(0); | 106 | .Times(0); |
| 1155 | 91 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::read); | 107 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read); |
| 1156 | 92 | buffer.ensure_available_for(mga::BufferAccess::read); | 108 | buffer.ensure_available_for(mga::BufferAccess::read); |
| 1157 | 93 | } | 109 | } |
| 1158 | 94 | 110 | ||
| 1159 | @@ -96,7 +112,7 @@ | |||
| 1160 | 96 | { | 112 | { |
| 1161 | 97 | EXPECT_CALL(*mock_fence, wait()) | 113 | EXPECT_CALL(*mock_fence, wait()) |
| 1162 | 98 | .Times(1); | 114 | .Times(1); |
| 1164 | 99 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::write); | 115 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::write); |
| 1165 | 100 | buffer.ensure_available_for(mga::BufferAccess::read); | 116 | buffer.ensure_available_for(mga::BufferAccess::read); |
| 1166 | 101 | } | 117 | } |
| 1167 | 102 | 118 | ||
| 1168 | @@ -104,7 +120,7 @@ | |||
| 1169 | 104 | { | 120 | { |
| 1170 | 105 | EXPECT_CALL(*mock_fence, wait()) | 121 | EXPECT_CALL(*mock_fence, wait()) |
| 1171 | 106 | .Times(1); | 122 | .Times(1); |
| 1173 | 107 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::read); | 123 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read); |
| 1174 | 108 | buffer.ensure_available_for(mga::BufferAccess::write); | 124 | buffer.ensure_available_for(mga::BufferAccess::write); |
| 1175 | 109 | } | 125 | } |
| 1176 | 110 | 126 | ||
| 1177 | @@ -112,7 +128,7 @@ | |||
| 1178 | 112 | { | 128 | { |
| 1179 | 113 | EXPECT_CALL(*mock_fence, wait()) | 129 | EXPECT_CALL(*mock_fence, wait()) |
| 1180 | 114 | .Times(1); | 130 | .Times(1); |
| 1182 | 115 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::write); | 131 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::write); |
| 1183 | 116 | buffer.ensure_available_for(mga::BufferAccess::write); | 132 | buffer.ensure_available_for(mga::BufferAccess::write); |
| 1184 | 117 | } | 133 | } |
| 1185 | 118 | 134 | ||
| 1186 | @@ -120,7 +136,7 @@ | |||
| 1187 | 120 | { | 136 | { |
| 1188 | 121 | EXPECT_CALL(*mock_fence, merge_with(fake_fd)) | 137 | EXPECT_CALL(*mock_fence, merge_with(fake_fd)) |
| 1189 | 122 | .Times(1); | 138 | .Times(1); |
| 1191 | 123 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::read); | 139 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read); |
| 1192 | 124 | buffer.update_usage(fake_fd, mga::BufferAccess::write); | 140 | buffer.update_usage(fake_fd, mga::BufferAccess::write); |
| 1193 | 125 | } | 141 | } |
| 1194 | 126 | 142 | ||
| 1195 | @@ -129,7 +145,7 @@ | |||
| 1196 | 129 | EXPECT_CALL(*mock_fence, wait()) | 145 | EXPECT_CALL(*mock_fence, wait()) |
| 1197 | 130 | .Times(3); | 146 | .Times(3); |
| 1198 | 131 | 147 | ||
| 1200 | 132 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::read); | 148 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read); |
| 1201 | 133 | buffer.ensure_available_for(mga::BufferAccess::write); | 149 | buffer.ensure_available_for(mga::BufferAccess::write); |
| 1202 | 134 | buffer.ensure_available_for(mga::BufferAccess::read); | 150 | buffer.ensure_available_for(mga::BufferAccess::read); |
| 1203 | 135 | 151 | ||
| 1204 | @@ -137,3 +153,30 @@ | |||
| 1205 | 137 | buffer.ensure_available_for(mga::BufferAccess::write); | 153 | buffer.ensure_available_for(mga::BufferAccess::write); |
| 1206 | 138 | buffer.ensure_available_for(mga::BufferAccess::read); | 154 | buffer.ensure_available_for(mga::BufferAccess::read); |
| 1207 | 139 | } | 155 | } |
| 1208 | 156 | |||
| 1209 | 157 | TEST_F(NativeBuffer, raises_egl_fence) | ||
| 1210 | 158 | { | ||
| 1211 | 159 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read); | ||
| 1212 | 160 | |||
| 1213 | 161 | EXPECT_CALL(*mock_cmdstream_sync, raise()); | ||
| 1214 | 162 | buffer.lock_for_gpu(); | ||
| 1215 | 163 | } | ||
| 1216 | 164 | |||
| 1217 | 165 | TEST_F(NativeBuffer, clears_egl_fence_successfully) | ||
| 1218 | 166 | { | ||
| 1219 | 167 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read); | ||
| 1220 | 168 | EXPECT_CALL(*mock_cmdstream_sync, wait_for(timeout)) | ||
| 1221 | 169 | .Times(1) | ||
| 1222 | 170 | .WillOnce(Return(true)); | ||
| 1223 | 171 | buffer.wait_for_unlock_by_gpu(); | ||
| 1224 | 172 | } | ||
| 1225 | 173 | |||
| 1226 | 174 | //not really helpful to throw if the timeout fails | ||
| 1227 | 175 | TEST_F(NativeBuffer, ignores_clears_egl_fence_failure) | ||
| 1228 | 176 | { | ||
| 1229 | 177 | mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read); | ||
| 1230 | 178 | EXPECT_CALL(*mock_cmdstream_sync, wait_for(timeout)) | ||
| 1231 | 179 | .Times(1) | ||
| 1232 | 180 | .WillOnce(Return(false)); | ||
| 1233 | 181 | buffer.wait_for_unlock_by_gpu(); | ||
| 1234 | 182 | } | ||
| 1235 | 140 | 183 | ||
| 1236 | === modified file 'tests/unit-tests/graphics/android/test_platform.cpp' | |||
| 1237 | --- tests/unit-tests/graphics/android/test_platform.cpp 2015-11-24 12:00:40 +0000 | |||
| 1238 | +++ tests/unit-tests/graphics/android/test_platform.cpp 2015-12-02 16:15:28 +0000 | |||
| 1239 | @@ -26,6 +26,7 @@ | |||
| 1240 | 26 | #include "mir/test/doubles/mock_display_report.h" | 26 | #include "mir/test/doubles/mock_display_report.h" |
| 1241 | 27 | #include "mir/test/doubles/mock_egl.h" | 27 | #include "mir/test/doubles/mock_egl.h" |
| 1242 | 28 | #include "mir/test/doubles/stub_display_builder.h" | 28 | #include "mir/test/doubles/stub_display_builder.h" |
| 1243 | 29 | #include "mir/test/doubles/stub_cmdstream_sync_factory.h" | ||
| 1244 | 29 | #include "mir/test/doubles/fd_matcher.h" | 30 | #include "mir/test/doubles/fd_matcher.h" |
| 1245 | 30 | #include "mir/test/fake_shared.h" | 31 | #include "mir/test/fake_shared.h" |
| 1246 | 31 | #include "mir/test/doubles/mock_android_native_buffer.h" | 32 | #include "mir/test/doubles/mock_android_native_buffer.h" |
| 1247 | @@ -54,6 +55,7 @@ | |||
| 1248 | 54 | using namespace testing; | 55 | using namespace testing; |
| 1249 | 55 | 56 | ||
| 1250 | 56 | stub_display_builder = std::make_shared<mtd::StubDisplayBuilder>(); | 57 | stub_display_builder = std::make_shared<mtd::StubDisplayBuilder>(); |
| 1251 | 58 | stub_sync_factory = std::make_shared<mtd::StubCmdStreamSyncFactory>(); | ||
| 1252 | 57 | stub_display_report = mr::null_display_report(); | 59 | stub_display_report = mr::null_display_report(); |
| 1253 | 58 | stride = geom::Stride(300*4); | 60 | stride = geom::Stride(300*4); |
| 1254 | 59 | 61 | ||
| 1255 | @@ -86,6 +88,7 @@ | |||
| 1256 | 86 | std::shared_ptr<mtd::MockAndroidNativeBuffer> native_buffer; | 88 | std::shared_ptr<mtd::MockAndroidNativeBuffer> native_buffer; |
| 1257 | 87 | std::shared_ptr<mtd::StubBufferAllocator> stub_buffer_allocator; | 89 | std::shared_ptr<mtd::StubBufferAllocator> stub_buffer_allocator; |
| 1258 | 88 | std::shared_ptr<mtd::StubDisplayBuilder> stub_display_builder; | 90 | std::shared_ptr<mtd::StubDisplayBuilder> stub_display_builder; |
| 1259 | 91 | std::shared_ptr<mtd::StubCmdStreamSyncFactory> stub_sync_factory; | ||
| 1260 | 89 | std::shared_ptr<mtd::MockBuffer> mock_buffer; | 92 | std::shared_ptr<mtd::MockBuffer> mock_buffer; |
| 1261 | 90 | std::shared_ptr<native_handle_t> native_buffer_handle; | 93 | std::shared_ptr<native_handle_t> native_buffer_handle; |
| 1262 | 91 | std::shared_ptr<mg::DisplayReport> stub_display_report; | 94 | std::shared_ptr<mg::DisplayReport> stub_display_report; |
| 1263 | @@ -99,10 +102,12 @@ | |||
| 1264 | 99 | { | 102 | { |
| 1265 | 100 | using namespace ::testing; | 103 | using namespace ::testing; |
| 1266 | 101 | int fake_fence{333}; | 104 | int fake_fence{333}; |
| 1267 | 105 | EXPECT_CALL(*native_buffer, wait_for_unlock_by_gpu()); | ||
| 1268 | 102 | EXPECT_CALL(*native_buffer, copy_fence()) | 106 | EXPECT_CALL(*native_buffer, copy_fence()) |
| 1269 | 103 | .WillOnce(Return(fake_fence)); | 107 | .WillOnce(Return(fake_fence)); |
| 1270 | 104 | 108 | ||
| 1272 | 105 | mga::Platform platform(stub_buffer_allocator, stub_display_builder, stub_display_report, mga::OverlayOptimization::enabled, quirks); | 109 | mga::Platform platform(stub_buffer_allocator, stub_display_builder, |
| 1273 | 110 | stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks); | ||
| 1274 | 106 | 111 | ||
| 1275 | 107 | mtd::MockBufferIpcMessage mock_ipc_msg; | 112 | mtd::MockBufferIpcMessage mock_ipc_msg; |
| 1276 | 108 | int offset = 0; | 113 | int offset = 0; |
| 1277 | @@ -130,10 +135,12 @@ | |||
| 1278 | 130 | TEST_F(PlatformBufferIPCPackaging, test_ipc_data_packed_correctly_for_full_ipc_without_fence) | 135 | TEST_F(PlatformBufferIPCPackaging, test_ipc_data_packed_correctly_for_full_ipc_without_fence) |
| 1279 | 131 | { | 136 | { |
| 1280 | 132 | using namespace ::testing; | 137 | using namespace ::testing; |
| 1281 | 138 | EXPECT_CALL(*native_buffer, wait_for_unlock_by_gpu()); | ||
| 1282 | 133 | EXPECT_CALL(*native_buffer, copy_fence()) | 139 | EXPECT_CALL(*native_buffer, copy_fence()) |
| 1283 | 134 | .WillOnce(Return(-1)); | 140 | .WillOnce(Return(-1)); |
| 1284 | 135 | 141 | ||
| 1286 | 136 | mga::Platform platform(stub_buffer_allocator, stub_display_builder, stub_display_report, mga::OverlayOptimization::enabled, quirks); | 142 | mga::Platform platform(stub_buffer_allocator, stub_display_builder, |
| 1287 | 143 | stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks); | ||
| 1288 | 137 | 144 | ||
| 1289 | 138 | mtd::MockBufferIpcMessage mock_ipc_msg; | 145 | mtd::MockBufferIpcMessage mock_ipc_msg; |
| 1290 | 139 | int offset = 0; | 146 | int offset = 0; |
| 1291 | @@ -169,10 +176,12 @@ | |||
| 1292 | 169 | TEST_F(PlatformBufferIPCPackaging, test_ipc_data_packed_correctly_for_nested) | 176 | TEST_F(PlatformBufferIPCPackaging, test_ipc_data_packed_correctly_for_nested) |
| 1293 | 170 | { | 177 | { |
| 1294 | 171 | using namespace ::testing; | 178 | using namespace ::testing; |
| 1295 | 179 | EXPECT_CALL(*native_buffer, wait_for_unlock_by_gpu()); | ||
| 1296 | 172 | EXPECT_CALL(*native_buffer, copy_fence()) | 180 | EXPECT_CALL(*native_buffer, copy_fence()) |
| 1297 | 173 | .WillOnce(Return(-1)); | 181 | .WillOnce(Return(-1)); |
| 1298 | 174 | 182 | ||
| 1300 | 175 | mga::Platform platform(stub_buffer_allocator, stub_display_builder, stub_display_report, mga::OverlayOptimization::enabled, quirks); | 183 | mga::Platform platform(stub_buffer_allocator, stub_display_builder, |
| 1301 | 184 | stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks); | ||
| 1302 | 176 | 185 | ||
| 1303 | 177 | mtd::MockBufferIpcMessage mock_ipc_msg; | 186 | mtd::MockBufferIpcMessage mock_ipc_msg; |
| 1304 | 178 | int offset = 0; | 187 | int offset = 0; |
| 1305 | @@ -207,7 +216,8 @@ | |||
| 1306 | 207 | using namespace ::testing; | 216 | using namespace ::testing; |
| 1307 | 208 | 217 | ||
| 1308 | 209 | int fake_fence{33}; | 218 | int fake_fence{33}; |
| 1310 | 210 | mga::Platform platform(stub_buffer_allocator, stub_display_builder, stub_display_report, mga::OverlayOptimization::enabled, quirks); | 219 | mga::Platform platform(stub_buffer_allocator, stub_display_builder, |
| 1311 | 220 | stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks); | ||
| 1312 | 211 | auto ipc_ops = platform.make_ipc_operations(); | 221 | auto ipc_ops = platform.make_ipc_operations(); |
| 1313 | 212 | 222 | ||
| 1314 | 213 | mtd::MockBufferIpcMessage mock_ipc_msg; | 223 | mtd::MockBufferIpcMessage mock_ipc_msg; |
| 1315 | @@ -234,6 +244,7 @@ | |||
| 1316 | 234 | mga::Platform platform( | 244 | mga::Platform platform( |
| 1317 | 235 | std::make_shared<mtd::StubBufferAllocator>(), | 245 | std::make_shared<mtd::StubBufferAllocator>(), |
| 1318 | 236 | std::make_shared<mtd::StubDisplayBuilder>(), | 246 | std::make_shared<mtd::StubDisplayBuilder>(), |
| 1319 | 247 | std::make_shared<mtd::StubCmdStreamSyncFactory>(), | ||
| 1320 | 237 | mr::null_display_report(), | 248 | mr::null_display_report(), |
| 1321 | 238 | mga::OverlayOptimization::enabled, | 249 | mga::OverlayOptimization::enabled, |
| 1322 | 239 | std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{})); | 250 | std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{})); |
FAILED: Continuous integration, rev:3127
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://