From de4c1350eb0737f5abe61ccda7d2071ad6354c3e Mon Sep 17 00:00:00 2001 From: Alan Griffiths Date: Fri, 10 Nov 2023 12:33:05 +0200 Subject: [PATCH] Rename files --- .../mir/graphics/{display_buffer.h => display_device.h} | 6 +++--- src/platforms/eglstream-kms/server/buffer_allocator.cpp | 2 +- src/platforms/eglstream-kms/server/display.cpp | 2 +- src/platforms/gbm-kms/server/buffer_allocator.cpp | 2 +- src/platforms/gbm-kms/server/kms/CMakeLists.txt | 2 +- src/platforms/gbm-kms/server/kms/display.cpp | 2 +- .../server/kms/{display_buffer.cpp => display_device.cpp} | 2 +- .../server/kms/{display_buffer.h => display_device.h} | 8 ++++---- src/platforms/renderer-generic-egl/buffer_allocator.cpp | 2 +- src/platforms/wayland/displayclient.h | 2 +- src/platforms/x11/graphics/CMakeLists.txt | 2 +- src/platforms/x11/graphics/display.cpp | 2 +- .../graphics/{display_buffer.cpp => display_device.cpp} | 2 +- .../x11/graphics/{display_buffer.h => display_device.h} | 8 ++++---- src/platforms/x11/graphics/platform.cpp | 2 +- src/renderers/gl/renderer.cpp | 2 +- src/server/compositor/basic_screen_shooter.cpp | 2 +- .../compositor/default_display_buffer_compositor.cpp | 2 +- .../default_display_buffer_compositor_factory.cpp | 2 +- src/server/compositor/multi_threaded_compositor.cpp | 2 +- src/server/server.cpp | 2 +- src/server/shell/graphics_display_layout.cpp | 2 +- .../{mock_display_buffer.h => mock_display_device.h} | 8 ++++---- tests/include/mir/test/doubles/mock_gl_display_buffer.h | 2 +- .../{null_display_buffer.h => null_display_device.h} | 8 ++++---- tests/include/mir/test/doubles/null_display_sync_group.h | 2 +- .../{stub_display_buffer.h => stub_display_device.h} | 8 ++++---- .../test_surface_stack_with_compositor.cpp | 2 +- .../headless_display_buffer_compositor_factory.cpp | 2 +- .../graphics_platform_test_harness.cpp | 2 +- tests/unit-tests/compositor/test_basic_screen_shooter.cpp | 2 +- .../compositor/test_default_display_buffer_compositor.cpp | 2 +- .../compositor/test_multi_threaded_compositor.cpp | 4 ++-- tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt | 4 ++-- .../{test_display_buffer.cpp => test_display_device.cpp} | 2 +- .../platforms/gbm-kms/kms/test_display_multi_monitor.cpp | 2 +- 36 files changed, 55 insertions(+), 55 deletions(-) rename include/platform/mir/graphics/{display_buffer.h => display_device.h} (98%) rename src/platforms/gbm-kms/server/kms/{display_buffer.cpp => display_device.cpp} (99%) rename src/platforms/gbm-kms/server/kms/{display_buffer.h => display_device.h} (95%) rename src/platforms/x11/graphics/{display_buffer.cpp => display_device.cpp} (99%) rename src/platforms/x11/graphics/{display_buffer.h => display_device.h} (93%) rename tests/include/mir/test/doubles/{mock_display_buffer.h => mock_display_device.h} (88%) rename tests/include/mir/test/doubles/{null_display_buffer.h => null_display_device.h} (87%) rename tests/include/mir/test/doubles/{stub_display_buffer.h => stub_display_device.h} (84%) rename tests/unit-tests/platforms/gbm-kms/kms/{test_display_buffer.cpp => test_display_device.cpp} (99%) diff --git a/include/platform/mir/graphics/display_buffer.h b/include/platform/mir/graphics/display_device.h similarity index 98% rename from include/platform/mir/graphics/display_buffer.h rename to include/platform/mir/graphics/display_device.h index c72e8bd03ff..b7baf89ce8a 100644 --- a/include/platform/mir/graphics/display_buffer.h +++ b/include/platform/mir/graphics/display_device.h @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#ifndef MIR_GRAPHICS_DISPLAY_BUFFER_H_ -#define MIR_GRAPHICS_DISPLAY_BUFFER_H_ +#ifndef MIR_GRAPHICS_DISPLAY_DEVICE_H_ +#define MIR_GRAPHICS_DISPLAY_DEVICE_H_ #include "mir/graphics/platform.h" #include @@ -157,4 +157,4 @@ class DisplayDevice } } -#endif /* MIR_GRAPHICS_DISPLAY_BUFFER_H_ */ +#endif /* MIR_GRAPHICS_DISPLAY_DEVICE_H_ */ diff --git a/src/platforms/eglstream-kms/server/buffer_allocator.cpp b/src/platforms/eglstream-kms/server/buffer_allocator.cpp index 5847913e6fb..dc4ce9b3e3e 100644 --- a/src/platforms/eglstream-kms/server/buffer_allocator.cpp +++ b/src/platforms/eglstream-kms/server/buffer_allocator.cpp @@ -20,7 +20,7 @@ #include "buffer_allocator.h" #include "cpu_copy_output_surface.h" #include "mir/anonymous_shm_file.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/graphics/drm_formats.h" #include "mir/graphics/egl_resources.h" #include "mir/graphics/gl_config.h" diff --git a/src/platforms/eglstream-kms/server/display.cpp b/src/platforms/eglstream-kms/server/display.cpp index b24980d2a1a..ff030f7d7b7 100644 --- a/src/platforms/eglstream-kms/server/display.cpp +++ b/src/platforms/eglstream-kms/server/display.cpp @@ -32,7 +32,7 @@ #include "mir/graphics/overlapping_output_grouping.h" #include "mir/graphics/gl_config.h" #include "mir/graphics/egl_error.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/graphics/transformation.h" #include "mir/graphics/egl_extensions.h" #include "mir/graphics/display_report.h" diff --git a/src/platforms/gbm-kms/server/buffer_allocator.cpp b/src/platforms/gbm-kms/server/buffer_allocator.cpp index 50a60c27943..93f3a84711f 100644 --- a/src/platforms/gbm-kms/server/buffer_allocator.cpp +++ b/src/platforms/gbm-kms/server/buffer_allocator.cpp @@ -34,7 +34,7 @@ #include "mir/graphics/egl_wayland_allocator.h" #include "mir/executor.h" #include "mir/renderer/gl/gl_surface.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "kms/egl_helper.h" #include "mir/graphics/drm_formats.h" #include "display_helpers.h" diff --git a/src/platforms/gbm-kms/server/kms/CMakeLists.txt b/src/platforms/gbm-kms/server/kms/CMakeLists.txt index e066a003aa2..89e750e5657 100644 --- a/src/platforms/gbm-kms/server/kms/CMakeLists.txt +++ b/src/platforms/gbm-kms/server/kms/CMakeLists.txt @@ -22,7 +22,7 @@ add_library( bypass.cpp cursor.cpp display.cpp - display_buffer.cpp + display_device.cpp page_flipper.h kms_page_flipper.cpp platform.cpp diff --git a/src/platforms/gbm-kms/server/kms/display.cpp b/src/platforms/gbm-kms/server/kms/display.cpp index f8902a245e9..e3fff6134d2 100644 --- a/src/platforms/gbm-kms/server/kms/display.cpp +++ b/src/platforms/gbm-kms/server/kms/display.cpp @@ -19,7 +19,7 @@ #include "kms/egl_helper.h" #include "mir/graphics/platform.h" #include "platform.h" -#include "display_buffer.h" +#include "display_device.h" #include "kms_display_configuration.h" #include "kms_output.h" #include "kms_page_flipper.h" diff --git a/src/platforms/gbm-kms/server/kms/display_buffer.cpp b/src/platforms/gbm-kms/server/kms/display_device.cpp similarity index 99% rename from src/platforms/gbm-kms/server/kms/display_buffer.cpp rename to src/platforms/gbm-kms/server/kms/display_device.cpp index 2550a64f705..60ec7819041 100644 --- a/src/platforms/gbm-kms/server/kms/display_buffer.cpp +++ b/src/platforms/gbm-kms/server/kms/display_device.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "display_buffer.h" +#include "display_device.h" #include "kms_cpu_addressable_display_provider.h" #include "kms_output.h" #include "cpu_addressable_fb.h" diff --git a/src/platforms/gbm-kms/server/kms/display_buffer.h b/src/platforms/gbm-kms/server/kms/display_device.h similarity index 95% rename from src/platforms/gbm-kms/server/kms/display_buffer.h rename to src/platforms/gbm-kms/server/kms/display_device.h index 0cd5e84329c..9011311ad7c 100644 --- a/src/platforms/gbm-kms/server/kms/display_buffer.h +++ b/src/platforms/gbm-kms/server/kms/display_device.h @@ -14,10 +14,10 @@ * along with this program. If not, see . */ -#ifndef MIR_GRAPHICS_GBM_DISPLAY_BUFFER_H_ -#define MIR_GRAPHICS_GBM_DISPLAY_BUFFER_H_ +#ifndef MIR_GRAPHICS_GBM_DISPLAY_DEVICE_H_ +#define MIR_GRAPHICS_GBM_DISPLAY_DEVICE_H_ -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/graphics/display.h" #include "display_helpers.h" #include "egl_helper.h" @@ -115,4 +115,4 @@ class DisplayDevice : public graphics::DisplayDevice, } } -#endif /* MIR_GRAPHICS_GBM_DISPLAY_BUFFER_H_ */ +#endif /* MIR_GRAPHICS_GBM_DISPLAY_DEVICE_H_ */ diff --git a/src/platforms/renderer-generic-egl/buffer_allocator.cpp b/src/platforms/renderer-generic-egl/buffer_allocator.cpp index b1164b4973a..320937b4ad9 100644 --- a/src/platforms/renderer-generic-egl/buffer_allocator.cpp +++ b/src/platforms/renderer-generic-egl/buffer_allocator.cpp @@ -32,7 +32,7 @@ #include "mir/graphics/egl_wayland_allocator.h" #include "mir/executor.h" #include "mir/renderer/gl/gl_surface.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/graphics/drm_formats.h" #include "mir/graphics/egl_error.h" #include "cpu_copy_output_surface.h" diff --git a/src/platforms/wayland/displayclient.h b/src/platforms/wayland/displayclient.h index b8dc83badc6..ed810b6cb1b 100644 --- a/src/platforms/wayland/displayclient.h +++ b/src/platforms/wayland/displayclient.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/platforms/x11/graphics/CMakeLists.txt b/src/platforms/x11/graphics/CMakeLists.txt index 25ae3708128..7cafac3898d 100644 --- a/src/platforms/x11/graphics/CMakeLists.txt +++ b/src/platforms/x11/graphics/CMakeLists.txt @@ -8,7 +8,7 @@ add_library( platform.cpp display.cpp display_configuration.cpp - display_buffer.cpp + display_device.cpp egl_helper.cpp ) diff --git a/src/platforms/x11/graphics/display.cpp b/src/platforms/x11/graphics/display.cpp index d3941a091cc..4f093795fb7 100644 --- a/src/platforms/x11/graphics/display.cpp +++ b/src/platforms/x11/graphics/display.cpp @@ -24,7 +24,7 @@ #include "display_configuration.h" #include "display.h" #include "platform.h" -#include "display_buffer.h" +#include "display_device.h" #include #include diff --git a/src/platforms/x11/graphics/display_buffer.cpp b/src/platforms/x11/graphics/display_device.cpp similarity index 99% rename from src/platforms/x11/graphics/display_buffer.cpp rename to src/platforms/x11/graphics/display_device.cpp index 783d29348ec..fc4b6e2a971 100644 --- a/src/platforms/x11/graphics/display_buffer.cpp +++ b/src/platforms/x11/graphics/display_device.cpp @@ -16,7 +16,7 @@ #include "mir/fatal.h" #include "platform.h" -#include "display_buffer.h" +#include "display_device.h" #include "display_configuration.h" #include "mir/graphics/display_report.h" #include "mir/graphics/transformation.h" diff --git a/src/platforms/x11/graphics/display_buffer.h b/src/platforms/x11/graphics/display_device.h similarity index 93% rename from src/platforms/x11/graphics/display_buffer.h rename to src/platforms/x11/graphics/display_device.h index 258aa745a34..79d4b2f4f73 100644 --- a/src/platforms/x11/graphics/display_buffer.h +++ b/src/platforms/x11/graphics/display_device.h @@ -14,10 +14,10 @@ * along with this program. If not, see . */ -#ifndef MIR_GRAPHICS_X_DISPLAY_BUFFER_H_ -#define MIR_GRAPHICS_X_DISPLAY_BUFFER_H_ +#ifndef MIR_GRAPHICS_X_DISPLAY_DEVICE_H_ +#define MIR_GRAPHICS_X_DISPLAY_DEVICE_H_ -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/graphics/display_configuration.h" #include "mir/graphics/display.h" #include "mir/graphics/platform.h" @@ -91,4 +91,4 @@ class DisplayDevice : public graphics::DisplayDevice, } } -#endif /* MIR_GRAPHICS_X_DISPLAY_BUFFER_H_ */ +#endif /* MIR_GRAPHICS_X_DISPLAY_DEVICE_H_ */ diff --git a/src/platforms/x11/graphics/platform.cpp b/src/platforms/x11/graphics/platform.cpp index 67ee27136f1..b3f816275e9 100644 --- a/src/platforms/x11/graphics/platform.cpp +++ b/src/platforms/x11/graphics/platform.cpp @@ -16,7 +16,7 @@ #include "platform.h" #include "display.h" -#include "display_buffer.h" +#include "display_device.h" #include "egl_helper.h" #include "mir/graphics/egl_error.h" #include "mir/graphics/platform.h" diff --git a/src/renderers/gl/renderer.cpp b/src/renderers/gl/renderer.cpp index 160e7824e29..93b9d7efdea 100644 --- a/src/renderers/gl/renderer.cpp +++ b/src/renderers/gl/renderer.cpp @@ -19,7 +19,7 @@ #include "mir/compositor/buffer_stream.h" #include "mir/graphics/renderable.h" #include "mir/graphics/buffer.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/gl/tessellation_helpers.h" #include "mir/log.h" #include "mir/report_exception.h" diff --git a/src/server/compositor/basic_screen_shooter.cpp b/src/server/compositor/basic_screen_shooter.cpp index b47c3b2d03a..93443ef0b09 100644 --- a/src/server/compositor/basic_screen_shooter.cpp +++ b/src/server/compositor/basic_screen_shooter.cpp @@ -26,7 +26,7 @@ #include "mir/graphics/platform.h" #include "mir/renderer/renderer_factory.h" #include "mir/renderer/sw/pixel_source.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" namespace mc = mir::compositor; namespace mr = mir::renderer; diff --git a/src/server/compositor/default_display_buffer_compositor.cpp b/src/server/compositor/default_display_buffer_compositor.cpp index c2c77a847b2..e18757df205 100644 --- a/src/server/compositor/default_display_buffer_compositor.cpp +++ b/src/server/compositor/default_display_buffer_compositor.cpp @@ -20,7 +20,7 @@ #include "mir/compositor/scene.h" #include "mir/compositor/scene_element.h" #include "mir/graphics/renderable.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/graphics/buffer.h" #include "mir/graphics/platform.h" #include "mir/compositor/buffer_stream.h" diff --git a/src/server/compositor/default_display_buffer_compositor_factory.cpp b/src/server/compositor/default_display_buffer_compositor_factory.cpp index 655d2ec241a..a756ea20b62 100644 --- a/src/server/compositor/default_display_buffer_compositor_factory.cpp +++ b/src/server/compositor/default_display_buffer_compositor_factory.cpp @@ -17,7 +17,7 @@ #include "default_display_buffer_compositor_factory.h" #include "mir/renderer/renderer_factory.h" #include "mir/renderer/renderer.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/renderer/gl/render_target.h" #include "mir/graphics/platform.h" #include "mir/renderer/gl/gl_surface.h" diff --git a/src/server/compositor/multi_threaded_compositor.cpp b/src/server/compositor/multi_threaded_compositor.cpp index cc7fd0838f9..d394738c364 100644 --- a/src/server/compositor/multi_threaded_compositor.cpp +++ b/src/server/compositor/multi_threaded_compositor.cpp @@ -16,7 +16,7 @@ #include "multi_threaded_compositor.h" #include "mir/graphics/display.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/compositor/display_buffer_compositor.h" #include "mir/compositor/display_buffer_compositor_factory.h" #include "mir/compositor/display_listener.h" diff --git a/src/server/server.cpp b/src/server/server.cpp index f3d1f6f99c6..daf623ea70b 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -20,7 +20,7 @@ #include "mir/fd.h" #include "mir/frontend/connector.h" #include "mir/graphics/graphic_buffer_allocator.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/input/composite_event_filter.h" #include "mir/input/event_filter.h" #include "mir/options/default_configuration.h" diff --git a/src/server/shell/graphics_display_layout.cpp b/src/server/shell/graphics_display_layout.cpp index 5d6ecd66b28..01e8078057d 100644 --- a/src/server/shell/graphics_display_layout.cpp +++ b/src/server/shell/graphics_display_layout.cpp @@ -16,7 +16,7 @@ #include "graphics_display_layout.h" #include "mir/graphics/display.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/geometry/rectangle.h" #include "mir/geometry/rectangles.h" diff --git a/tests/include/mir/test/doubles/mock_display_buffer.h b/tests/include/mir/test/doubles/mock_display_device.h similarity index 88% rename from tests/include/mir/test/doubles/mock_display_buffer.h rename to tests/include/mir/test/doubles/mock_display_device.h index b95af9afd33..65b48324273 100644 --- a/tests/include/mir/test/doubles/mock_display_buffer.h +++ b/tests/include/mir/test/doubles/mock_display_device.h @@ -14,10 +14,10 @@ * along with this program. If not, see . */ -#ifndef MIR_TEST_DOUBLES_MOCK_DISPLAY_BUFFER_H_ -#define MIR_TEST_DOUBLES_MOCK_DISPLAY_BUFFER_H_ +#ifndef MIR_TEST_DOUBLES_MOCK_DISPLAY_DEVICE_H_ +#define MIR_TEST_DOUBLES_MOCK_DISPLAY_DEVICE_H_ -#include +#include #include #include @@ -50,4 +50,4 @@ class MockDisplayDevice : public graphics::DisplayDevice } } -#endif /* MIR_TEST_DOUBLES_MOCK_DISPLAY_BUFFER_H_ */ +#endif /* MIR_TEST_DOUBLES_MOCK_DISPLAY_DEVICE_H_ */ diff --git a/tests/include/mir/test/doubles/mock_gl_display_buffer.h b/tests/include/mir/test/doubles/mock_gl_display_buffer.h index ac28c4bdfd4..8e2a8b1f550 100644 --- a/tests/include/mir/test/doubles/mock_gl_display_buffer.h +++ b/tests/include/mir/test/doubles/mock_gl_display_buffer.h @@ -17,7 +17,7 @@ #ifndef MIR_TEST_DOUBLES_MOCK_GL_DISPLAY_BUFFER_H_ #define MIR_TEST_DOUBLES_MOCK_GL_DISPLAY_BUFFER_H_ -#include "mock_display_buffer.h" +#include "mock_display_device.h" #include "mir/renderer/gl/render_target.h" namespace mir diff --git a/tests/include/mir/test/doubles/null_display_buffer.h b/tests/include/mir/test/doubles/null_display_device.h similarity index 87% rename from tests/include/mir/test/doubles/null_display_buffer.h rename to tests/include/mir/test/doubles/null_display_device.h index b84a098b75c..58c679878a9 100644 --- a/tests/include/mir/test/doubles/null_display_buffer.h +++ b/tests/include/mir/test/doubles/null_display_device.h @@ -14,10 +14,10 @@ * along with this program. If not, see . */ -#ifndef MIR_TEST_DOUBLES_NULL_DISPLAY_BUFFER_H_ -#define MIR_TEST_DOUBLES_NULL_DISPLAY_BUFFER_H_ +#ifndef MIR_TEST_DOUBLES_NULL_DISPLAY_DEVICE_H_ +#define MIR_TEST_DOUBLES_NULL_DISPLAY_DEVICE_H_ -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" namespace mir { @@ -45,4 +45,4 @@ class NullDisplayDevice : public graphics::DisplayDevice } } -#endif /* MIR_TEST_DOUBLES_NULL_DISPLAY_BUFFER_H_ */ +#endif /* MIR_TEST_DOUBLES_NULL_DISPLAY_DEVICE_H_ */ diff --git a/tests/include/mir/test/doubles/null_display_sync_group.h b/tests/include/mir/test/doubles/null_display_sync_group.h index 8dc569b14c1..d7f28de9603 100644 --- a/tests/include/mir/test/doubles/null_display_sync_group.h +++ b/tests/include/mir/test/doubles/null_display_sync_group.h @@ -19,7 +19,7 @@ #include "mir/graphics/display.h" #include "mir/geometry/size.h" -#include "mir/test/doubles/stub_display_buffer.h" +#include "mir/test/doubles/stub_display_device.h" #include namespace mir diff --git a/tests/include/mir/test/doubles/stub_display_buffer.h b/tests/include/mir/test/doubles/stub_display_device.h similarity index 84% rename from tests/include/mir/test/doubles/stub_display_buffer.h rename to tests/include/mir/test/doubles/stub_display_device.h index e968f3a4ed5..a1f730f6cb8 100644 --- a/tests/include/mir/test/doubles/stub_display_buffer.h +++ b/tests/include/mir/test/doubles/stub_display_device.h @@ -14,10 +14,10 @@ * along with this program. If not, see . */ -#ifndef MIR_TEST_DOUBLES_STUB_DISPLAY_BUFFER_H_ -#define MIR_TEST_DOUBLES_STUB_DISPLAY_BUFFER_H_ +#ifndef MIR_TEST_DOUBLES_STUB_DISPLAY_DEVICE_H_ +#define MIR_TEST_DOUBLES_STUB_DISPLAY_DEVICE_H_ -#include "mir/test/doubles/null_display_buffer.h" +#include "mir/test/doubles/null_display_device.h" #include "mir/geometry/rectangle.h" namespace mir @@ -42,4 +42,4 @@ class StubDisplayBuffer : public NullDisplayDevice } } -#endif /* MIR_TEST_DOUBLES_STUB_DISPLAY_BUFFER_H_ */ +#endif /* MIR_TEST_DOUBLES_STUB_DISPLAY_DEVICE_H_ */ diff --git a/tests/integration-tests/test_surface_stack_with_compositor.cpp b/tests/integration-tests/test_surface_stack_with_compositor.cpp index cedef6f3b41..b6add956084 100644 --- a/tests/integration-tests/test_surface_stack_with_compositor.cpp +++ b/tests/integration-tests/test_surface_stack_with_compositor.cpp @@ -27,7 +27,7 @@ #include "mir/test/doubles/mock_buffer_stream.h" #include "mir/test/doubles/null_display.h" #include "mir/test/doubles/stub_renderer.h" -#include "mir/test/doubles/stub_display_buffer.h" +#include "mir/test/doubles/stub_display_device.h" #include "mir/test/doubles/stub_buffer.h" #include "mir/test/doubles/null_display_sync_group.h" #include "mir/test/doubles/mock_event_sink.h" diff --git a/tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp b/tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp index b73d81cd11e..45cf1c1bdd5 100644 --- a/tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp +++ b/tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp @@ -16,7 +16,7 @@ #include "mir_test_framework/headless_display_buffer_compositor_factory.h" #include "mir_test_framework/passthrough_tracker.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/graphics/texture.h" #include "mir/graphics/platform.h" #include "mir/renderer/gl/gl_surface.h" diff --git a/tests/platform_test_harness/graphics_platform_test_harness.cpp b/tests/platform_test_harness/graphics_platform_test_harness.cpp index 42a4411dd88..5fa227f018a 100644 --- a/tests/platform_test_harness/graphics_platform_test_harness.cpp +++ b/tests/platform_test_harness/graphics_platform_test_harness.cpp @@ -16,7 +16,7 @@ #include "mir/graphics/platform.h" #include "mir/graphics/display.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/graphics/graphic_buffer_allocator.h" #include "mir/options/program_option.h" #include "mir/shared_library.h" diff --git a/tests/unit-tests/compositor/test_basic_screen_shooter.cpp b/tests/unit-tests/compositor/test_basic_screen_shooter.cpp index 293c31a1d60..e0bc0bf63ea 100644 --- a/tests/unit-tests/compositor/test_basic_screen_shooter.cpp +++ b/tests/unit-tests/compositor/test_basic_screen_shooter.cpp @@ -16,7 +16,7 @@ #include "mir/executor.h" #include "mir/graphics/platform.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/renderer/gl/gl_surface.h" #include "mir/test/doubles/stub_gl_rendering_provider.h" #include "src/server/compositor/basic_screen_shooter.h" diff --git a/tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp b/tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp index c99f663fa2c..023e185b087 100644 --- a/tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp +++ b/tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp @@ -21,7 +21,7 @@ #include "mir/geometry/rectangle.h" #include "mir/test/doubles/mock_renderer.h" #include "mir/test/fake_shared.h" -#include "mir/test/doubles/mock_display_buffer.h" +#include "mir/test/doubles/mock_display_device.h" #include "mir/test/doubles/fake_renderable.h" #include "mir/test/doubles/mock_compositor_report.h" #include "mir/test/doubles/stub_scene_element.h" diff --git a/tests/unit-tests/compositor/test_multi_threaded_compositor.cpp b/tests/unit-tests/compositor/test_multi_threaded_compositor.cpp index c692908a936..7b3feda844f 100644 --- a/tests/unit-tests/compositor/test_multi_threaded_compositor.cpp +++ b/tests/unit-tests/compositor/test_multi_threaded_compositor.cpp @@ -26,8 +26,8 @@ #include "mir/test/current_thread_name.h" #include "mir/test/doubles/null_display.h" -#include "mir/test/doubles/null_display_buffer.h" -#include "mir/test/doubles/mock_display_buffer.h" +#include "mir/test/doubles/null_display_device.h" +#include "mir/test/doubles/mock_display_device.h" #include "mir/test/doubles/mock_compositor_report.h" #include "mir/test/doubles/mock_scene.h" #include "mir/test/doubles/stub_scene.h" diff --git a/tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt b/tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt index b1bef7f8ab7..f706dfe86da 100644 --- a/tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt +++ b/tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt @@ -1,7 +1,7 @@ mir_add_wrapped_executable(mir_unit_tests_gbm-kms NOINSTALL ${CMAKE_CURRENT_SOURCE_DIR}/test_platform.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_display_generic.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_display_buffer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/test_display_device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_display_multi_monitor.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_display_configuration.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_real_kms_output.cpp @@ -18,7 +18,7 @@ mir_add_wrapped_executable(mir_unit_tests_gbm-kms NOINSTALL set_property( SOURCE test_platform.cpp test_graphics_platform.cpp test_buffer_allocator.cpp test_display.cpp test_display_generic.cpp test_display_multi_monitor.cpp test_display_configuration.cpp - test_display_buffer.cpp test_drm_helper.cpp + test_display_device.cpp test_drm_helper.cpp PROPERTY COMPILE_OPTIONS -Wno-variadic-macros) add_dependencies(mir_unit_tests_gbm-kms GMock) diff --git a/tests/unit-tests/platforms/gbm-kms/kms/test_display_buffer.cpp b/tests/unit-tests/platforms/gbm-kms/kms/test_display_device.cpp similarity index 99% rename from tests/unit-tests/platforms/gbm-kms/kms/test_display_buffer.cpp rename to tests/unit-tests/platforms/gbm-kms/kms/test_display_device.cpp index bfb588b0a85..4b0920262a7 100644 --- a/tests/unit-tests/platforms/gbm-kms/kms/test_display_buffer.cpp +++ b/tests/unit-tests/platforms/gbm-kms/kms/test_display_device.cpp @@ -17,7 +17,7 @@ #include "mir/test/doubles/null_emergency_cleanup.h" #include "src/server/report/null_report_factory.h" #include "src/platforms/gbm-kms/server/kms/platform.h" -#include "src/platforms/gbm-kms/server/kms/display_buffer.h" +#include "src/platforms/gbm-kms/server/kms/display_device.h" #include "mir/graphics/dmabuf_buffer.h" #include "mir/test/doubles/mock_egl.h" #include "mir/test/doubles/mock_gl.h" diff --git a/tests/unit-tests/platforms/gbm-kms/kms/test_display_multi_monitor.cpp b/tests/unit-tests/platforms/gbm-kms/kms/test_display_multi_monitor.cpp index e1d6ef805e3..59f7c619cee 100644 --- a/tests/unit-tests/platforms/gbm-kms/kms/test_display_multi_monitor.cpp +++ b/tests/unit-tests/platforms/gbm-kms/kms/test_display_multi_monitor.cpp @@ -15,7 +15,7 @@ */ #include "mir/graphics/display.h" -#include "mir/graphics/display_buffer.h" +#include "mir/graphics/display_device.h" #include "mir/graphics/display_configuration.h" #include "mir/graphics/drm_formats.h" #include "mir/graphics/platform.h"