No longer holding the pointer to the InitialRender

canonical · Sep 1, 2023 · c403e9c · c403e9c
1 parent 63c6c73
commit c403e9c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/src/include/server/mir/default_server_configuration.h b/src/include/server/mir/default_server_configuration.h
@@ -108,7 +108,6 @@ class GraphicBufferAllocator;
 class Cursor;
 class CursorImage;
 class GLConfig;
-class InitialRender;
 }
 namespace input
 {
@@ -231,7 +230,6 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
     virtual std::shared_ptr<input::CursorImages> the_cursor_images();
     std::shared_ptr<ObserverRegistrar<graphics::DisplayConfigurationObserver>>
         the_display_configuration_observer_registrar();
-    virtual std::shared_ptr<graphics::InitialRender> the_initial_render(std::shared_ptr<graphics::Display> in_display);
 
     /** @} */
 
@@ -389,7 +387,6 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
     CachedPtr<graphics::Cursor>       cursor;
     CachedPtr<graphics::CursorImage>  default_cursor_image;
     CachedPtr<input::CursorImages> cursor_images;
-    CachedPtr<graphics::InitialRender> initial_render;
 
     CachedPtr<frontend::SessionAuthorizer> session_authorizer;
     CachedPtr<renderer::RendererFactory> renderer_factory;

diff --git a/src/server/graphics/default_configuration.cpp b/src/server/graphics/default_configuration.cpp
@@ -419,7 +419,15 @@ mir::DefaultServerConfiguration::the_display()
                 std::move(displays),
                 *the_display_configuration_policy());
 
-            the_initial_render(multiplexed_display);
+            auto initial = multiplexed_display->create_initial_render();
+            if (initial)
+            {
+                for (auto const& renderable : initial->get_renderables())
+                {
+                    the_input_scene()->add_input_visualization(renderable);
+                }
+            }
+
             return multiplexed_display;
         });
 }
@@ -497,25 +505,4 @@ mir::DefaultServerConfiguration::the_display_configuration_observer()
         {
             return std::make_shared<mg::DisplayConfigurationObserverMultiplexer>(default_executor);
         });
-}
-
-std::shared_ptr<mg::InitialRender>
-mir::DefaultServerConfiguration::the_initial_render(std::shared_ptr<mg::Display> in_display)
-{
-    // TODO: This got weird. It is basically a helper initialization function instead of a "the_xyz()" thingy
-    return initial_render(
-        [display = in_display, input_scene = the_input_scene()]
-        {
-            auto initial = display->create_initial_render();
-            if (initial)
-            {
-                for (auto const& renderable : initial->get_renderables())
-                {
-                    input_scene->add_input_visualization(renderable);
-                }
-            }
-
-
-            return initial;
-        });
 }
diff --git a/src/server/symbols.map b/src/server/symbols.map
@@ -912,7 +912,6 @@ MIR_SERVER_2.15 {
     mir::shell::SurfaceStackWrapper::send_to_back*;
     mir::shell::ShellWrapper::swap_z_order*;
     mir::shell::ShellWrapper::send_to_back*;
-    mir::DefaultServerConfiguration::the_initial_render*;
  };
  local: *;
 };