First pass at removing unnecessaries

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

Hide file tree

Showing 9 changed files with 0 additions and 33 deletions.
diff --git a/include/platform/mir/graphics/platform.h b/include/platform/mir/graphics/platform.h
@@ -49,10 +49,6 @@ namespace renderer::software
 {
 class WriteMappableBuffer;
 }
-namespace input
-{
-class Scene;
-}
 
 /// Graphics subsystem. Mediates interaction between core system and
 /// the graphics environment.

diff --git a/src/platforms/common/server/shm_buffer.cpp b/src/platforms/common/server/shm_buffer.cpp
@@ -99,7 +99,6 @@ mgc::ShmBuffer::ShmBuffer(
       pixel_format_{format},
       egl_delegate{std::move(egl_delegate)}
 {
-    mir::log_info("Constructed A");
 }
 
 mgc::MemoryBackedShmBuffer::MemoryBackedShmBuffer(
@@ -110,7 +109,6 @@ mgc::MemoryBackedShmBuffer::MemoryBackedShmBuffer(
       stride_{MIR_BYTES_PER_PIXEL(pixel_format) * size.width.as_uint32_t()},
       pixels{new unsigned char[stride_.as_int() * size.height.as_int()]}
 {
-    mir::log_info("Constructed B");
 }
 
 mgc::ShmBuffer::~ShmBuffer() noexcept

diff --git a/src/platforms/gbm-kms/server/buffer_allocator.cpp b/src/platforms/gbm-kms/server/buffer_allocator.cpp
@@ -160,15 +160,13 @@ mgg::BufferAllocator::BufferAllocator(EGLDisplay dpy, EGLContext share_with)
 std::shared_ptr<mg::Buffer> mgg::BufferAllocator::alloc_software_buffer(
     geom::Size size, MirPixelFormat format)
 {
-    mir::log_info("Before format");
     if (!mgc::MemoryBackedShmBuffer::supports(format))
     {
         BOOST_THROW_EXCEPTION(
             std::runtime_error(
                 "Trying to create SHM buffer with unsupported pixel format"));
     }
 
-    mir::log_info("After format");
     return std::make_shared<mgc::MemoryBackedShmBuffer>(size, format, egl_delegate);
 }
 
@@ -319,11 +317,6 @@ auto mgg::BufferAllocator::shared_egl_context() -> EGLContext
     return static_cast<EGLContext>(*ctx);
 }
 
-auto mgg::BufferAllocator::get_egl_delegate() -> std::shared_ptr<common::EGLContextExecutor>
-{
-    return egl_delegate;
-}
-
 auto mgg::GLRenderingProvider::as_texture(std::shared_ptr<Buffer> buffer) -> std::shared_ptr<gl::Texture>
 {
     return std::dynamic_pointer_cast<gl::Texture>(buffer);

diff --git a/src/platforms/gbm-kms/server/buffer_allocator.h b/src/platforms/gbm-kms/server/buffer_allocator.h
@@ -71,7 +71,6 @@ class BufferAllocator:
         std::function<void()>&& on_release) -> std::shared_ptr<Buffer> override;
 
     auto shared_egl_context() -> EGLContext;
-    auto get_egl_delegate() -> std::shared_ptr<common::EGLContextExecutor>;
 private:
     std::unique_ptr<renderer::gl::Context> const ctx;
     std::shared_ptr<common::EGLContextExecutor> const egl_delegate;

diff --git a/src/platforms/gbm-kms/server/kms/display.cpp b/src/platforms/gbm-kms/server/kms/display.cpp
@@ -28,7 +28,6 @@
 #include "mir/console_services.h"
 #include "mir/graphics/overlapping_output_grouping.h"
 #include "mir/graphics/event_handler_register.h"
-#include "shm_buffer.h"
 
 #include "mir/graphics/display_report.h"
 #include "mir/graphics/display_configuration_policy.h"

diff --git a/src/platforms/gbm-kms/server/kms/display.h b/src/platforms/gbm-kms/server/kms/display.h
@@ -44,11 +44,6 @@ class EventHandlerRegister;
 class GLConfig;
 class GraphicBufferAllocator;
 
-namespace common
-{
-class EGLContextExecutor;
-}
-
 namespace gbm
 {
 

diff --git a/src/platforms/gbm-kms/server/kms/display_buffer.cpp b/src/platforms/gbm-kms/server/kms/display_buffer.cpp
@@ -31,8 +31,6 @@
 #include "mir/graphics/dmabuf_buffer.h"
 #include "mir/graphics/graphic_buffer_allocator.h"
 #include "mir/graphics/renderable.h"
-#include "mir/renderer/sw/pixel_source.h"
-#include "shm_buffer.h"
 
 #include <boost/throw_exception.hpp>
 #include <EGL/egl.h>

diff --git a/src/platforms/gbm-kms/server/kms/display_buffer.h b/src/platforms/gbm-kms/server/kms/display_buffer.h
@@ -31,23 +31,13 @@
 namespace mir
 {
 
-namespace input
-{
-class Scene;
-}
-
 namespace graphics
 {
 
 class DisplayReport;
 class GLConfig;
 class GraphicBufferAllocator;
 
-namespace common {
-class MemoryBackedShmBuffer;
-class EGLContextExecutor;
-}
-
 namespace gbm
 {
 

diff --git a/src/server/scene/surface_stack.h b/src/server/scene/surface_stack.h
@@ -40,7 +40,6 @@ namespace mir
 namespace graphics
 {
 class Renderable;
-class InitialRender;
 }
 /// Management of Surface objects. Includes the model (SurfaceStack and Surface
 /// classes) and controller (SurfaceController) elements of an MVC design.