From eb81b66b4e0aa71de6728364924e97d8161ff6d8 Mon Sep 17 00:00:00 2001
From: Jelle Raaijmakers <jelle@gmta.nl>
Date: Sun, 4 Sep 2022 19:56:00 +0200
Subject: [PATCH] LibGL+LibGPU+LibSoftGPU: Rename `blit_color_buffer_to`

This makes it consistent with our other `blit_from_color_buffer` and
paves the way for a third method that will be introduced in one of the
next commits.
---
 Userland/Libraries/LibGL/GLContext.cpp   |  2 +-
 Userland/Libraries/LibGPU/Device.h       |  2 +-
 Userland/Libraries/LibSoftGPU/Device.cpp | 16 ++++++++--------
 Userland/Libraries/LibSoftGPU/Device.h   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Userland/Libraries/LibGL/GLContext.cpp b/Userland/Libraries/LibGL/GLContext.cpp
index 2c1c050556..23d2440604 100644
--- a/Userland/Libraries/LibGL/GLContext.cpp
+++ b/Userland/Libraries/LibGL/GLContext.cpp
@@ -905,7 +905,7 @@ void GLContext::gl_point_size(GLfloat size)
 
 void GLContext::present()
 {
-    m_rasterizer->blit_color_buffer_to(*m_frontbuffer);
+    m_rasterizer->blit_from_color_buffer(*m_frontbuffer);
 }
 
 void GLContext::sync_device_config()
diff --git a/Userland/Libraries/LibGPU/Device.h b/Userland/Libraries/LibGPU/Device.h
index 712bc1338a..b40704e4c4 100644
--- a/Userland/Libraries/LibGPU/Device.h
+++ b/Userland/Libraries/LibGPU/Device.h
@@ -47,7 +47,7 @@ public:
     virtual void clear_color(FloatVector4 const&) = 0;
     virtual void clear_depth(DepthType) = 0;
     virtual void clear_stencil(StencilType) = 0;
-    virtual void blit_color_buffer_to(Gfx::Bitmap& target) = 0;
+    virtual void blit_from_color_buffer(Gfx::Bitmap& target) = 0;
     virtual void blit_from_color_buffer(void*, Vector2<i32> offset, GPU::ImageDataLayout const&) = 0;
     virtual void blit_from_depth_buffer(void*, Vector2<i32> offset, GPU::ImageDataLayout const&) = 0;
     virtual void blit_to_color_buffer_at_raster_position(void const*, GPU::ImageDataLayout const&) = 0;
diff --git a/Userland/Libraries/LibSoftGPU/Device.cpp b/Userland/Libraries/LibSoftGPU/Device.cpp
index e864bf34c2..ac3870780a 100644
--- a/Userland/Libraries/LibSoftGPU/Device.cpp
+++ b/Userland/Libraries/LibSoftGPU/Device.cpp
@@ -1458,6 +1458,14 @@ GPU::ImageDataLayout Device::depth_buffer_data_layout(Vector2<u32> size, Vector2
     };
 }
 
+void Device::blit_from_color_buffer(Gfx::Bitmap& target)
+{
+    m_frame_buffer->color_buffer()->blit_flipped_to_bitmap(target, m_frame_buffer->rect());
+
+    if constexpr (ENABLE_STATISTICS_OVERLAY)
+        draw_statistics_overlay(target);
+}
+
 void Device::blit_from_color_buffer(void* output_data, Vector2<i32> input_offset, GPU::ImageDataLayout const& output_layout)
 {
     auto const& output_selection = output_layout.selection;
@@ -1521,14 +1529,6 @@ void Device::blit_to_depth_buffer_at_raster_position(void const* input_data, GPU
         dbgln("Pixel conversion failed: {}", conversion_result.error().string_literal());
 }
 
-void Device::blit_color_buffer_to(Gfx::Bitmap& target)
-{
-    m_frame_buffer->color_buffer()->blit_flipped_to_bitmap(target, m_frame_buffer->rect());
-
-    if constexpr (ENABLE_STATISTICS_OVERLAY)
-        draw_statistics_overlay(target);
-}
-
 void Device::draw_statistics_overlay(Gfx::Bitmap& target)
 {
     static Core::ElapsedTimer timer;
diff --git a/Userland/Libraries/LibSoftGPU/Device.h b/Userland/Libraries/LibSoftGPU/Device.h
index 18b4ba1c86..7fa1dbfbfd 100644
--- a/Userland/Libraries/LibSoftGPU/Device.h
+++ b/Userland/Libraries/LibSoftGPU/Device.h
@@ -52,9 +52,9 @@ public:
     virtual void clear_color(FloatVector4 const&) override;
     virtual void clear_depth(GPU::DepthType) override;
     virtual void clear_stencil(GPU::StencilType) override;
+    virtual void blit_from_color_buffer(Gfx::Bitmap& target) override;
     virtual void blit_from_color_buffer(void*, Vector2<i32> offset, GPU::ImageDataLayout const&) override;
     virtual void blit_from_depth_buffer(void*, Vector2<i32> offset, GPU::ImageDataLayout const&) override;
-    virtual void blit_color_buffer_to(Gfx::Bitmap& target) override;
     virtual void blit_to_color_buffer_at_raster_position(void const*, GPU::ImageDataLayout const&) override;
     virtual void blit_to_depth_buffer_at_raster_position(void const*, GPU::ImageDataLayout const&) override;
     virtual void set_options(GPU::RasterizerOptions const&) override;