Rename files

canonical · Nov 10, 2023 · de4c135 · de4c135
1 parent d7e9fdc
commit de4c135
Show file tree

Hide file tree

Showing 36 changed files with 55 additions and 55 deletions.
diff --git a/...de/platform/mir/graphics/display_buffer.h → ...de/platform/mir/graphics/display_device.h b/...de/platform/mir/graphics/display_buffer.h → ...de/platform/mir/graphics/display_device.h
@@ -14,8 +14,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 <mir/geometry/rectangle.h>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...rms/gbm-kms/server/kms/display_buffer.cpp → ...rms/gbm-kms/server/kms/display_device.cpp b/...rms/gbm-kms/server/kms/display_buffer.cpp → ...rms/gbm-kms/server/kms/display_device.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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/...forms/gbm-kms/server/kms/display_buffer.h → ...forms/gbm-kms/server/kms/display_device.h b/...forms/gbm-kms/server/kms/display_buffer.h → ...forms/gbm-kms/server/kms/display_device.h
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
@@ -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
@@ -20,7 +20,7 @@
 
 #include <mir/geometry/rectangles.h>
 #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/renderer/gl/render_target.h>
 #include <mir/graphics/gl_config.h>

diff --git 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
@@ -24,7 +24,7 @@
 #include "display_configuration.h"
 #include "display.h"
 #include "platform.h"
-#include "display_buffer.h"
+#include "display_device.h"
 
 #include <boost/throw_exception.hpp>
 #include <algorithm>

diff --git a/...platforms/x11/graphics/display_buffer.cpp → ...platforms/x11/graphics/display_device.cpp b/...platforms/x11/graphics/display_buffer.cpp → ...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 → src/platforms/x11/graphics/display_device.h b/src/platforms/x11/graphics/display_buffer.h → src/platforms/x11/graphics/display_device.h
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...de/mir/test/doubles/mock_display_buffer.h → ...de/mir/test/doubles/mock_display_device.h b/...de/mir/test/doubles/mock_display_buffer.h → ...de/mir/test/doubles/mock_display_device.h
@@ -14,10 +14,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 <mir/graphics/display_buffer.h>
+#include <mir/graphics/display_device.h>
 #include <mir/graphics/platform.h>
 
 #include <gmock/gmock.h>
@@ -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
@@ -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/...de/mir/test/doubles/null_display_buffer.h → ...de/mir/test/doubles/null_display_device.h b/...de/mir/test/doubles/null_display_buffer.h → ...de/mir/test/doubles/null_display_device.h
@@ -14,10 +14,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
@@ -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 <thread>
 
 namespace mir

diff --git a/...de/mir/test/doubles/stub_display_buffer.h → ...de/mir/test/doubles/stub_display_device.h b/...de/mir/test/doubles/stub_display_buffer.h → ...de/mir/test/doubles/stub_display_device.h
@@ -14,10 +14,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...forms/gbm-kms/kms/test_display_buffer.cpp → ...forms/gbm-kms/kms/test_display_device.cpp b/...forms/gbm-kms/kms/test_display_buffer.cpp → ...forms/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
@@ -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"