Skip to content

Commit cb7df47

Browse files
authored
platform/graphics: Remove dependency on udev/wrapper.h header (#3118)
1 parent 26fdef4 commit cb7df47

File tree

12 files changed

+17
-1
lines changed

12 files changed

+17
-1
lines changed

include/platform/mir/graphics/platform.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "mir/graphics/drm_formats.h"
2626
#include "mir/module_properties.h"
2727
#include "mir/module_deleter.h"
28-
#include "mir/udev/wrapper.h"
2928
#include "mir/renderer/sw/pixel_source.h"
3029

3130
#include <EGL/egl.h>
@@ -49,6 +48,12 @@ namespace renderer::software
4948
class WriteMappableBuffer;
5049
}
5150

51+
namespace udev
52+
{
53+
class Context;
54+
class Device;
55+
}
56+
5257
/// Graphics subsystem. Mediates interaction between core system and
5358
/// the graphics environment.
5459
namespace graphics

src/platforms/renderer-generic-egl/platform_symbols.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "mir/module_deleter.h"
2323
#include "mir/assert_module_entry_point.h"
2424
#include "mir/libname.h"
25+
#include "mir/udev/wrapper.h"
2526
#include "mir/graphics/platform.h"
2627
#include "mir/graphics/egl_error.h"
2728
#include "mir/graphics/gl_config.h"

src/platforms/virtual/graphics.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <mir/assert_module_entry_point.h>
2323
#include <mir/libname.h>
2424
#include <mir/options/program_option.h>
25+
#include <mir/udev/wrapper.h>
2526

2627
namespace mg = mir::graphics;
2728
namespace mo = mir::options;

src/platforms/wayland/platform_symbols.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <mir/assert_module_entry_point.h>
2424
#include <mir/libname.h>
2525
#include <mir/options/program_option.h>
26+
#include <mir/udev/wrapper.h>
2627

2728
namespace mg = mir::graphics;
2829
namespace mo = mir::options;

src/platforms/x11/graphics/graphics.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "mir/module_deleter.h"
2424
#include "mir/assert_module_entry_point.h"
2525
#include "mir/libname.h"
26+
#include "mir/udev/wrapper.h"
2627
#include "mir/graphics/egl_error.h"
2728
#include "mir/graphics/egl_logger.h"
2829

src/server/graphics/default_configuration.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "mir/log.h"
3838
#include "mir/report_exception.h"
3939
#include "mir/main_loop.h"
40+
#include "mir/udev/wrapper.h"
4041

4142
#include <boost/throw_exception.hpp>
4243

src/server/graphics/platform_probe.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "mir/log.h"
1818
#include "mir/graphics/platform.h"
1919
#include "mir/shared_library.h"
20+
#include "mir/udev/wrapper.h"
2021
#include "platform_probe.h"
2122

2223
#include <boost/throw_exception.hpp>

tests/mir_test_framework/platform_graphics_dummy.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "mir/libname.h"
1818
#include "mir/graphics/platform.h"
1919
#include "mir/assert_module_entry_point.h"
20+
#include "mir/udev/wrapper.h"
2021

2122
namespace mg = mir::graphics;
2223

tests/mir_test_framework/platform_graphics_throw.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "mir/assert_module_entry_point.h"
2121
#include "mir/libname.h"
2222
#include "mir/options/program_option.h"
23+
#include "mir/udev/wrapper.h"
2324

2425
#include <boost/throw_exception.hpp>
2526
#include <stdlib.h>

tests/platform_test_harness/graphics_platform_test_harness.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "mir/renderer/renderer.h"
2828
#include "mir/main_loop.h"
2929
#include "mir/renderer/gl/gl_surface.h"
30+
#include "mir/udev/wrapper.h"
3031

3132
#include "../../src/include/platform/mir/graphics/pixel_format_utils.h"
3233
#include "mir/default_server_configuration.h"

tests/unit-tests/graphics/test_platform_prober.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "mir/graphics/platform.h"
2222
#include "src/server/graphics/platform_probe.h"
2323
#include "mir/options/program_option.h"
24+
#include "mir/udev/wrapper.h"
2425

2526
#include "mir/raii.h"
2627

tests/unit-tests/platforms/x11/test_platform.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "src/platforms/x11/graphics/platform.h"
2323
#include "src/platforms/x11/x11_resources.h"
2424
#include "src/server/report/null/display_report.h"
25+
#include "mir/udev/wrapper.h"
2526

2627
#include "mir/test/doubles/mock_x11_resources.h"
2728
#include "mir/test/doubles/mock_x11.h"

0 commit comments

Comments
 (0)