~vanvugt/mir/vbox

« back to all changes in this revision

Viewing changes to include/core/mir_toolkit/common.h

Committer: Daniel van Vugt
Date: 2016-11-07 07:24:23 UTC
mfrom: (3798.1.8 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20161107072423-6tvrewjaxgqogcii

Merge latest trunk

files added:
playground/diamond.c

playground/diamond.h

playground/mir_egl_platform_shim.c

playground/mir_egl_platform_shim.h

files renamed:
playground/eglflash_render_surface.c => playground/egldiamond_render_surface.c

files modified:
include/client/mir_toolkit/client_types.h

include/core/mir_toolkit/common.h

include/platform/mir/graphics/display.h

include/platform/mir/graphics/display_configuration.h

include/test/mir/test/doubles/null_display.h

playground/CMakeLists.txt

playground/render_surface.cpp

src/client/CMakeLists.txt

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_render_surface.h

src/client/mir_render_surface_api.cpp

src/client/render_surface.cpp

src/client/render_surface.h

src/client/symbols.map

src/common/output_type_names.cpp

src/include/client/mir_toolkit/mir_render_surface.h

src/platform/graphics/CMakeLists.txt

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/eglstream-kms/server/display.cpp

src/platforms/eglstream-kms/server/display.h

src/platforms/mesa/server/kms/display.cpp

src/platforms/mesa/server/kms/display.h

src/platforms/mesa/server/x11/graphics/display.cpp

src/platforms/mesa/server/x11/graphics/display.h

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display.h

tests/acceptance-tests/staging/test_render_surface.cpp

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

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

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

tests/integration-tests/test_server_client_types.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/unit-tests/client/test_connection_resource_map.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/platforms/android/server/test_display.cpp

tests/unit-tests/platforms/android/server/test_hwc_fb_device.cpp

tests/unit-tests/platforms/android/server/test_hwc_logger.cpp

tests/unit-tests/platforms/android/server/test_hwc_wrapper.cpp

Show diffs side-by-side

added added

removed removed

include/core/mir_toolkit/common.h

123

mir_output_type_hdmib = 12, /* DRM_MODE_CONNECTOR_HDMIB */

124

mir_output_type_tv = 13, /* DRM_MODE_CONNECTOR_TV */

125

mir_output_type_edp = 14, /* DRM_MODE_CONNECTOR_eDP */

126

mir_output_type_virtual = 15 /* DRM_MODE_CONNECTOR_VIRTUAL */

127

/* TODO = 16 DRM_MODE_CONNECTOR_DSI */

126

mir_output_type_virtual = 15, /* DRM_MODE_CONNECTOR_VIRTUAL */

127

mir_output_type_dsi = 16, /* DRM_MODE_CONNECTOR_DSI */

128

mir_output_type_dpi = 17, /* DRM_MODE_CONNECTOR_DPI */

128

129

} MirOutputType;

129

130

131

typedef enum MirPromptSessionState

Older »