~vanvugt/mir/enable-dynamic-queue-scaling

« back to all changes in this revision

Viewing changes to src/platforms/android/common/egl_sync_extensions.cpp

Committer: Daniel van Vugt
Date: 2016-02-10 06:30:37 UTC
mfrom: (3293.1.6 trunk)
Revision ID: daniel.van.vugt@canonical.com-20160210063037-r2gwpxc25ggyr9cg

Merge latest trunk

files added:
src/client/screencast_stream.cpp

src/client/screencast_stream.h

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/mock_protobuf_server.h

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

tests/unit-tests/client/test_screencast_stream.cpp

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/client/CMakeLists.txt

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_screencast.cpp

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

src/server/compositor/multi_threaded_compositor.cpp

src/server/display_server.cpp

src/server/input/default_input_manager.cpp

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/client/CMakeLists.txt

tests/unit-tests/client/test_client_buffer_stream.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/common/egl_sync_extensions.cpp

* This program is free software: you can redistribute it and/or modify it

* under the terms of the GNU Lesser General Public License version 3,

* as published by the Free Software Foundation.

* This program is distributed in the hope that it will be useful,

* but WITHOUT ANY WARRANTY; without even the implied warranty of

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

* GNU Lesser General Public License for more details.

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

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

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

#include "egl_sync_extensions.h"

#include <boost/throw_exception.hpp>

#include <stdexcept>

namespace mg=mir::graphics;

mg::EGLSyncExtensions::EGLSyncExtensions() :

eglCreateSyncKHR{

reinterpret_cast<PFNEGLCREATESYNCKHRPROC>(eglGetProcAddress("eglCreateSyncKHR"))},

eglDestroySyncKHR{

reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(eglGetProcAddress("eglDestroySyncKHR"))},

eglClientWaitSyncKHR{

reinterpret_cast<PFNEGLCLIENTWAITSYNCKHRPROC>(eglGetProcAddress("eglClientWaitSyncKHR"))}

{

if (!eglCreateSyncKHR || !eglDestroySyncKHR || !eglClientWaitSyncKHR)

BOOST_THROW_EXCEPTION(std::runtime_error("EGL doesn't support the KHR_reusable_sync extension"));

}

Older »