=== renamed file 'src/server/report/null/display_report.h' => 'include/platform/mir/graphics/null_display_report.h'
--- src/server/report/null/display_report.h 2015-04-28 07:54:10 +0000
+++ include/platform/mir/graphics/null_display_report.h 2016-09-07 03:00:58 +0000
@@ -2,23 +2,23 @@
* Copyright © 2012 Canonical Ltd.
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
+ * under the terms of the GNU Lesser General Public License version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*
* Authored by: Alan Griffiths
*/
-#ifndef MIR_REPORT_NULL_DISPLAY_REPORT_H_
-#define MIR_REPORT_NULL_DISPLAY_REPORT_H_
+#ifndef MIR_GRAPHICS_NULL_DISPLAY_REPORT_H_
+#define MIR_GRAPHICS_NULL_DISPLAY_REPORT_H_
#include "mir/graphics/display_report.h"
@@ -26,11 +26,9 @@
namespace mir
{
-namespace report
-{
-namespace null
-{
-class DisplayReport : public graphics::DisplayReport
+namespace graphics
+{
+class NullDisplayReport : public graphics::DisplayReport
{
public:
@@ -47,6 +45,5 @@
};
}
}
-}
-#endif /* MIR_REPORT_NULL_DISPLAY_REPORT_H_ */
+#endif /* MIR_GRAPHICS_NULL_DISPLAY_REPORT_H_ */
=== modified file 'src/platform/graphics/CMakeLists.txt'
--- src/platform/graphics/CMakeLists.txt 2016-06-02 05:33:50 +0000
+++ src/platform/graphics/CMakeLists.txt 2016-09-07 03:00:58 +0000
@@ -11,6 +11,7 @@
pixel_format_utils.cpp
overlapping_output_grouping.cpp
platform_probe.cpp
+ null_display_report.cpp
)
add_library(mirplatformgraphicscommon OBJECT
=== renamed file 'src/server/report/null/display_report.cpp' => 'src/platform/graphics/null_display_report.cpp'
--- src/server/report/null/display_report.cpp 2015-04-28 07:54:10 +0000
+++ src/platform/graphics/null_display_report.cpp 2016-09-07 03:00:58 +0000
@@ -2,31 +2,33 @@
* Copyright © 2013 Canonical Ltd.
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
+ * under the terms of the GNU Lesser General Public License version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*
* Authored by: Alan Griffiths
*/
-#include "display_report.h"
-
-namespace mrn = mir::report::null;
-
-void mrn::DisplayReport::report_successful_setup_of_native_resources() {}
-void mrn::DisplayReport::report_successful_egl_make_current_on_construction() {}
-void mrn::DisplayReport::report_successful_egl_buffer_swap_on_construction() {}
-void mrn::DisplayReport::report_successful_drm_mode_set_crtc_on_construction() {}
-void mrn::DisplayReport::report_successful_display_construction() {}
-void mrn::DisplayReport::report_drm_master_failure(int) {}
-void mrn::DisplayReport::report_vt_switch_away_failure() {}
-void mrn::DisplayReport::report_vt_switch_back_failure() {}
-void mrn::DisplayReport::report_egl_configuration(EGLDisplay, EGLConfig) {}
-void mrn::DisplayReport::report_vsync(unsigned int) {}
+#include "mir/graphics/null_display_report.h"
+
+namespace mir { namespace graphics {
+
+void NullDisplayReport::report_successful_setup_of_native_resources() {}
+void NullDisplayReport::report_successful_egl_make_current_on_construction() {}
+void NullDisplayReport::report_successful_egl_buffer_swap_on_construction() {}
+void NullDisplayReport::report_successful_drm_mode_set_crtc_on_construction() {}
+void NullDisplayReport::report_successful_display_construction() {}
+void NullDisplayReport::report_drm_master_failure(int) {}
+void NullDisplayReport::report_vt_switch_away_failure() {}
+void NullDisplayReport::report_vt_switch_back_failure() {}
+void NullDisplayReport::report_egl_configuration(EGLDisplay, EGLConfig) {}
+void NullDisplayReport::report_vsync(unsigned int) {}
+
+}} // namespace mir::graphics
=== modified file 'src/platform/symbols.map'
--- src/platform/symbols.map 2016-08-22 14:36:40 +0000
+++ src/platform/symbols.map 2016-09-07 03:00:58 +0000
@@ -270,6 +270,9 @@
android::isEligibleBuiltInKeyboard*;
__android_log_assert;
__android_log_print;
+
+ vtable?for?mir::graphics::NullDisplayReport*;
+ mir::graphics::NullDisplayReport*;
};
local: *;
};
=== modified file 'src/platforms/android/server/device_quirks.cpp'
--- src/platforms/android/server/device_quirks.cpp 2016-08-07 20:38:35 +0000
+++ src/platforms/android/server/device_quirks.cpp 2016-09-07 03:00:58 +0000
@@ -18,7 +18,7 @@
#include
#include
-#include "mir/graphics/display_report.h"
+#include "mir/graphics/null_display_report.h"
#include "mir/graphics/gl_config.h"
#include "gl_context.h"
#include "device_quirks.h"
@@ -100,19 +100,7 @@
return false;
}
-struct NullReport : mg::DisplayReport
-{
- void report_successful_setup_of_native_resources() override {};
- void report_successful_egl_make_current_on_construction() override {};
- void report_successful_egl_buffer_swap_on_construction() override {};
- void report_successful_display_construction() override {};
- void report_egl_configuration(EGLDisplay, EGLConfig) override {};
- void report_vsync(unsigned int) override {};
- void report_successful_drm_mode_set_crtc_on_construction() override {};
- void report_drm_master_failure(int) override {};
- void report_vt_switch_away_failure() override {};
- void report_vt_switch_back_failure() override {};
-} report;
+mg::NullDisplayReport report;
struct Config : mg::GLConfig
{
=== modified file 'src/platforms/android/utils/render_overlays.cpp'
--- src/platforms/android/utils/render_overlays.cpp 2016-08-16 19:34:28 +0000
+++ src/platforms/android/utils/render_overlays.cpp 2016-09-07 03:00:58 +0000
@@ -26,7 +26,7 @@
#include "mir/graphics/graphic_buffer_allocator.h"
#include "mir/graphics/buffer_properties.h"
#include "mir/graphics/gl_config.h"
-#include "mir/graphics/display_report.h"
+#include "mir/graphics/null_display_report.h"
#include "mir/renderer/gl/render_target.h"
#include "mir/renderer/sw/pixel_source.h"
#include "mir_image.h"
@@ -226,19 +226,6 @@
int stencil_buffer_bits() const override { return 0; }
};
-struct DisplayReport : mg::DisplayReport
-{
- void report_successful_setup_of_native_resources() override {}
- void report_successful_egl_make_current_on_construction() override {}
- void report_successful_egl_buffer_swap_on_construction() override {}
- void report_successful_display_construction() override {}
- void report_egl_configuration(EGLDisplay, EGLConfig) override {}
- void report_vsync(unsigned int) override {}
- void report_successful_drm_mode_set_crtc_on_construction() override {}
- void report_drm_master_failure(int) override {}
- void report_vt_switch_away_failure() override {}
- void report_vt_switch_back_failure() override {}
-};
}
int main(int argc, char const** argv)
@@ -265,7 +252,7 @@
auto platform_fn = platform_library->load_function(
"create_host_platform", MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
- auto platform = platform_fn(options, nullptr, std::make_shared());
+ auto platform = platform_fn(options, nullptr, std::make_shared());
//Strange issues going on here with dlopen() + hybris (which uses gnu_indirect_functions)
//https://github.com/libhybris/libhybris/issues/315
=== modified file 'src/server/report/null/CMakeLists.txt'
--- src/server/report/null/CMakeLists.txt 2016-07-28 23:00:22 +0000
+++ src/server/report/null/CMakeLists.txt 2016-09-07 03:00:58 +0000
@@ -3,7 +3,6 @@
compositor_report.cpp
connector_report.cpp
- display_report.cpp
input_report.cpp
message_processor_report.cpp
null_report_factory.cpp
=== modified file 'src/server/report/null/null_report_factory.cpp'
--- src/server/report/null/null_report_factory.cpp 2016-07-28 23:00:22 +0000
+++ src/server/report/null/null_report_factory.cpp 2016-09-07 03:00:58 +0000
@@ -22,11 +22,11 @@
#include "connector_report.h"
#include "message_processor_report.h"
#include "session_mediator_report.h"
-#include "display_report.h"
#include "input_report.h"
#include "seat_report.h"
#include "shell_report.h"
#include "scene_report.h"
+#include "mir/graphics/null_display_report.h"
#include "mir/logging/null_shared_library_prober_report.h"
std::shared_ptr mir::report::NullReportFactory::create_compositor_report()
@@ -36,7 +36,7 @@
std::shared_ptr mir::report::NullReportFactory::create_display_report()
{
- return std::make_shared();
+ return std::make_shared();
}
std::shared_ptr mir::report::NullReportFactory::create_scene_report()
=== modified file 'tests/unit-tests/platforms/nested/test_nested_display.cpp'
--- tests/unit-tests/platforms/nested/test_nested_display.cpp 2016-05-04 20:53:03 +0000
+++ tests/unit-tests/platforms/nested/test_nested_display.cpp 2016-09-07 03:00:58 +0000
@@ -19,7 +19,7 @@
#include "src/server/graphics/nested/display.h"
#include "src/server/graphics/nested/host_connection.h"
#include "src/server/graphics/nested/host_surface.h"
-#include "src/server/report/null/display_report.h"
+#include "mir/graphics/null_display_report.h"
#include "mir/graphics/default_display_configuration_policy.h"
#include "src/server/input/null_input_dispatcher.h"
#include "mir_display_configuration_builder.h"
@@ -77,7 +77,7 @@
testing::NiceMock mock_egl;
mi::NullInputDispatcher null_input_dispatcher;
- mir::report::null::DisplayReport null_display_report;
+ mg::NullDisplayReport null_display_report;
mg::CloneDisplayConfigurationPolicy default_conf_policy;
mtd::StubGLConfig stub_gl_config;
std::shared_ptr null_platform{