← Back to branch summary

~mir-team/mir/compositing-always-finishes

~mir-team/mir/compositing-always-finishes

« back to all changes in this revision

Viewing changes to src/platforms/android/client/gralloc_registrar.cpp

Committer: Tarmac
Author(s): Kevin DuBois
Date: 2016-02-09 17:07:23 UTC
mfrom: (3266.7.18 refix-1517205)
Revision ID: tarmac-20160209170723-lv4mbmekpp9v11q3

repropose already landed branch introducing sync fences
(https://code.launchpad.net/~kdub/mir/egl-sync-fences/+merge/278181)
while avoiding the mx4/powervr regression that caused its reversion.

fixes: LP: #1517205. Fixes: https://bugs.launchpad.net/bugs/1517205.

Approved by PS Jenkins bot, Alexandros Frantzis, mir-ci-bot, Alan Griffiths.

files added:
src/platforms/android/common/egl_sync_extensions.cpp

src/platforms/android/include/android

src/platforms/android/include/android/native_window.h

src/platforms/android/include/command_stream_sync.h

src/platforms/android/include/egl_sync_extensions.h

src/platforms/android/server/cmdstream_sync_factory.h

src/platforms/android/server/egl_sync_factory.cpp

tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h

tests/unit-tests/graphics/android/test_egl_sync_extensions.cpp

files renamed:
src/platform/graphics/egl_sync_fence.cpp => src/platforms/android/common/egl_sync_fence.cpp

src/include/platform/mir/graphics/egl_sync_fence.h => src/platforms/android/include/egl_sync_fence.h

files modified:
include/renderers/gl/mir/renderer/gl/texture_source.h

src/gl/recently_used_cache.cpp

src/include/platform/mir/graphics/egl_extensions.h

src/platform/graphics/CMakeLists.txt

src/platform/graphics/egl_extensions.cpp

src/platforms/android/client/CMakeLists.txt

src/platforms/android/client/gralloc_registrar.cpp

src/platforms/android/common/CMakeLists.txt

src/platforms/android/common/android_native_buffer.cpp

src/platforms/android/include/android_native_buffer.h

src/platforms/android/include/native_buffer.h

src/platforms/android/server/CMakeLists.txt

src/platforms/android/server/android_alloc_adaptor.cpp

src/platforms/android/server/android_alloc_adaptor.h

src/platforms/android/server/android_buffer_allocator.cpp

src/platforms/android/server/android_graphic_buffer_allocator.h

src/platforms/android/server/buffer.cpp

src/platforms/android/server/buffer.h

src/platforms/android/server/device_quirks.cpp

src/platforms/android/server/device_quirks.h

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/display_component_factory.h

src/platforms/android/server/display_device.h

src/platforms/android/server/fb_device.cpp

src/platforms/android/server/fb_device.h

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hal_component_factory.h

src/platforms/android/server/hwc_device.cpp

src/platforms/android/server/hwc_device.h

src/platforms/android/server/hwc_fb_device.cpp

src/platforms/android/server/hwc_fb_device.h

src/platforms/android/server/ipc_operations.cpp

src/platforms/android/server/platform.cpp

src/platforms/android/server/platform.h

src/platforms/mesa/server/common/gbm_buffer.cpp

src/platforms/mesa/server/common/gbm_buffer.h

src/platforms/mesa/server/common/shm_buffer.cpp

src/platforms/mesa/server/common/shm_buffer.h

tests/include/mir/test/doubles/mock_android_native_buffer.h

tests/include/mir/test/doubles/mock_buffer.h

tests/include/mir/test/doubles/mock_display_device.h

tests/include/mir/test/doubles/mock_gl_buffer.h

tests/include/mir/test/doubles/stub_android_native_buffer.h

tests/include/mir/test/doubles/stub_display_builder.h

tests/include/mir/test/doubles/stub_gl_buffer.h

tests/integration-tests/graphics/mesa/test_buffer_integration.cpp

tests/unit-tests/gl/test_gl_texture_cache.cpp

tests/unit-tests/gl/test_program_factory.cpp

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp

tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp

tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp

tests/unit-tests/graphics/android/test_display_buffer.cpp

tests/unit-tests/graphics/android/test_display_hotplug.cpp

tests/unit-tests/graphics/android/test_fb_device.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_fb_device.cpp

tests/unit-tests/graphics/android/test_native_buffer.cpp

tests/unit-tests/graphics/android/test_platform.cpp

tests/unit-tests/graphics/test_egl_extensions.cpp

tests/unit-tests/graphics/test_egl_sync_fence.cpp

Show diffs side-by-side

added added

removed removed

src/platforms/android/client/gralloc_registrar.cpp

13

13

* You should have received a copy of the GNU Lesser General Public License

14

14

* along with this program. If not, see <http://www.gnu.org/licenses/>.

15

15

*

16

* Authored by: Kevin DuBois<kevin.dubois@canonical.com>

16

* Authored by: Kevin DuBois <kevin.dubois@canonical.com>

17

17

*/

18

18

19

#include "egl_sync_fence.h"

19

20

#include "android_native_buffer.h"

20

21

#include "sync_fence.h"

21

22

#include "gralloc_registrar.h"

82

83

anwb->usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER;

83

84

anwb->handle = handle.get();

84

85

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

87

return std::make_shared<mga::AndroidNativeBuffer>(anwb, sync, fence, mga::BufferAccess::read);

86

88

}

87

89

}

88

90

std::shared_ptr<mg::NativeBuffer> mcla::GrallocRegistrar::register_buffer(

Older »