GRAPHICS: Split conversion.cpp into multiple files

madmoose · Dec 22, 2022 · 7f2d9fd · 7f2d9fd
1 parent 12fbeca
commit 7f2d9fd
Show file tree

Hide file tree

Showing 23 changed files with 589 additions and 528 deletions.
diff --git a/backends/graphics/android/android-graphics.cpp b/backends/graphics/android/android-graphics.cpp
@@ -36,7 +36,7 @@
 // for the Android port
 #define FORBIDDEN_SYMBOL_EXCEPTION_printf
 
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 
 #include "backends/graphics/opengl/pipelines/pipeline.h"
 

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
@@ -44,7 +44,7 @@
 #endif
 #endif
 
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 #ifdef USE_OSD
 #include "graphics/fontman.h"
 #include "graphics/font.h"

diff --git a/backends/graphics/opengl/texture.cpp b/backends/graphics/opengl/texture.cpp
@@ -31,7 +31,7 @@
 #include "common/rect.h"
 #include "common/textconsole.h"
 
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 
 #ifdef USE_SCALERS
 #include "graphics/scalerplugin.h"

diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -34,7 +34,7 @@
 #ifdef USE_RGB_COLOR
 #include "common/list.h"
 #endif
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 #include "graphics/font.h"
 #include "graphics/fontman.h"
 #include "graphics/scaler.h"

diff --git a/backends/graphics3d/android/android-graphics3d.cpp b/backends/graphics3d/android/android-graphics3d.cpp
@@ -37,7 +37,7 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_printf
 
 #include "common/tokenizer.h"
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 #include "graphics/opengl/shader.h"
 #include "graphics/opengl/context.h"
 

diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
@@ -36,7 +36,7 @@
 
 #include "engines/engine.h"
 
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 #include "graphics/opengl/context.h"
 #include "graphics/opengl/system_headers.h"
 

diff --git a/backends/platform/3ds/osystem-graphics.cpp b/backends/platform/3ds/osystem-graphics.cpp
@@ -26,7 +26,7 @@
 #include "backends/platform/3ds/options-dialog.h"
 #include "backends/platform/3ds/config.h"
 #include "common/rect.h"
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 #include "graphics/fontman.h"
 #include "gui/gui-manager.h"
 

diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp
@@ -22,7 +22,7 @@
 #define RONIN_TIMER_ACCESS
 
 #include "common/scummsys.h"
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 #include "graphics/surface.h"
 #include "dc.h"
 

diff --git a/backends/platform/ds/ds-graphics.cpp b/backends/platform/ds/ds-graphics.cpp
@@ -26,7 +26,7 @@
 
 #include "common/translation.h"
 
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 
 namespace DS {
 

diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
@@ -25,7 +25,7 @@
 #include "backends/platform/ios7/ios7_osys_main.h"
 #include "backends/platform/ios7/ios7_video.h"
 
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 #include "backends/platform/ios7/ios7_app_delegate.h"
 
 @interface iOS7AlertHandler : NSObject<UIAlertViewDelegate>

diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm
@@ -25,7 +25,7 @@
 #include "backends/platform/iphone/osys_main.h"
 #include "backends/platform/iphone/iphone_video.h"
 
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 
 void OSystem_IPHONE::engineInit() {
 	EventsBaseBackend::engineInit();

diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp
@@ -32,7 +32,7 @@
 #include "backends/mutex/null/null-mutex.h"
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 
 typedef unsigned long long uint64;
 

diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
@@ -27,7 +27,7 @@
 #include <gxflux/gfx_con.h>
 
 #include "common/config-manager.h"
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 #include "backends/fs/wii/wii-fs-factory.h"
 
 #include "osystem.h"

diff --git a/engines/cryo/eden_graphics.cpp b/engines/cryo/eden_graphics.cpp
@@ -25,7 +25,7 @@
 #include "cryo/eden.h"
 #include "cryo/eden_graphics.h"
 
-#include "graphics/conversion.h"
+#include "graphics/blit.h"
 #include "graphics/palette.h"
 #include "video/hnm_decoder.h"
 

diff --git a/engines/myst3/myst3.cpp b/engines/myst3/myst3.cpp
@@ -53,7 +53,6 @@
 
 #include "image/jpeg.h"
 
-#include "graphics/conversion.h"
 #include "graphics/renderer.h"
 #include "graphics/yuv_to_rgb.h"
 #include "graphics/framelimiter.h"