~alan-griffiths/mir/keep-helgrind-happy

Viewing changes to src/server/graphics/nested/nested_display.cpp

Committer: Tarmac
Author(s): Alexandros Frantzis
Date: 2014-02-13 23:14:04 UTC
mfrom: (1381.2.8 build-multiple-platforms)
Revision ID: tarmac-20140213231404-498hz81kz0txa939

build: Allow building multiple platforms in the same build.

Approved by PS Jenkins bot, Andreas Pokorny, Kevin DuBois, Alberto Aguirre, Alan Griffiths.

files modified:
CMakeLists.txt

cmake/FindXKBCOMMON.cmake

cmake/MirCommon.cmake

cross-compile-chroot.sh

debian/control

examples/render_overlays.cpp

examples/scroll.cpp

src/client/CMakeLists.txt

src/client/android/CMakeLists.txt

src/client/mesa/CMakeLists.txt

src/client/mesa/client_platform.cpp

src/client/mir_client_library.cpp

src/client/mir_screencast_api.cpp

src/platform/graphics/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/mesa/CMakeLists.txt

src/server/graphics/nested/nested_display.cpp

src/shared/CMakeLists.txt

src/shared/graphics/android/CMakeLists.txt

tests/CMakeLists.txt

tests/draw/CMakeLists.txt

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/CMakeLists.txt

tests/integration-tests/input/CMakeLists.txt

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_framework/testing_client_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/mesa/test_internal_client.cpp

Show diffs side-by-side

added added

removed removed

src/server/graphics/nested/nested_display.cpp

107

108

EGLNativeWindowType mgn::detail::EGLDisplayHandle::native_window(EGLConfig /*egl_config*/, MirSurface* mir_surface) const

109

{

110

auto const native_window = static_cast<EGLNativeWindowType>(mir_surface_get_egl_native_window(mir_surface));

110

auto const native_window =

111

reinterpret_cast<EGLNativeWindowType>(mir_surface_get_egl_native_window(mir_surface));

111

112

if (!native_window)

112

113

BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to fetch EGL native window."));

113

114

Older »