[Scummvm-git-logs] scummvm master -> 0c59f5a6734011fe4219016e0e8d6b254876dd7f

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0c59f5a673 TINYGL: Moved PixelBuffer to TinyGL


Commit: 0c59f5a6734011fe4219016e0e8d6b254876dd7f
    https://github.com/scummvm/scummvm/commit/0c59f5a6734011fe4219016e0e8d6b254876dd7f
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-11-27T21:29:02+01:00

Commit Message:
TINYGL: Moved PixelBuffer to TinyGL

Changed paths:
  A graphics/tinygl/pixelbuffer.cpp
  A graphics/tinygl/pixelbuffer.h
  R graphics/pixelbuffer.cpp
  R graphics/pixelbuffer.h
    graphics/module.mk
    graphics/tinygl/texelbuffer.h
    graphics/tinygl/zblit.cpp
    graphics/tinygl/zbuffer.h


diff --git a/graphics/module.mk b/graphics/module.mk
index 00b5f005e7..69573a8501 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -47,7 +47,6 @@ MODULE_OBJS := \
 	VectorRendererSpec.o \
 	wincursor.o \
 	yuv_to_rgb.o \
-	pixelbuffer.o \
 	opengl/context.o \
 	opengl/framebuffer.o \
 	opengl/texture.o \
@@ -72,6 +71,7 @@ MODULE_OBJS += \
 	tinygl/matrix.o \
 	tinygl/memory.o \
 	tinygl/misc.o \
+	tinygl/pixelbuffer.o \
 	tinygl/select.o \
 	tinygl/specbuf.o \
 	tinygl/texture.o \
diff --git a/graphics/pixelbuffer.cpp b/graphics/tinygl/pixelbuffer.cpp
similarity index 98%
rename from graphics/pixelbuffer.cpp
rename to graphics/tinygl/pixelbuffer.cpp
index 4701266a47..e315f636a4 100644
--- a/graphics/pixelbuffer.cpp
+++ b/graphics/tinygl/pixelbuffer.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "graphics/pixelbuffer.h"
+#include "graphics/tinygl/pixelbuffer.h"
 
 namespace Graphics {
 
diff --git a/graphics/pixelbuffer.h b/graphics/tinygl/pixelbuffer.h
similarity index 100%
rename from graphics/pixelbuffer.h
rename to graphics/tinygl/pixelbuffer.h
diff --git a/graphics/tinygl/texelbuffer.h b/graphics/tinygl/texelbuffer.h
index 651964eee3..6af586a92c 100644
--- a/graphics/tinygl/texelbuffer.h
+++ b/graphics/tinygl/texelbuffer.h
@@ -23,7 +23,7 @@
 #ifndef GRAPHICS_TEXELBUFFER_H
 #define GRAPHICS_TEXELBUFFER_H
 
-#include "graphics/pixelbuffer.h"
+#include "graphics/tinygl/pixelbuffer.h"
 
 namespace Graphics {
 
diff --git a/graphics/tinygl/zblit.cpp b/graphics/tinygl/zblit.cpp
index 4d649540fc..3b24f9788d 100644
--- a/graphics/tinygl/zblit.cpp
+++ b/graphics/tinygl/zblit.cpp
@@ -26,10 +26,11 @@
  * It also has modifications by the ResidualVM-team, which are covered under the GPLv2 (or later).
  */
 
+#include "common/array.h"
+
 #include "graphics/tinygl/zblit.h"
 #include "graphics/tinygl/zgl.h"
-#include "graphics/pixelbuffer.h"
-#include "common/array.h"
+#include "graphics/tinygl/pixelbuffer.h"
 #include "graphics/tinygl/zdirtyrect.h"
 #include "graphics/tinygl/gl.h"
 #include <math.h>
diff --git a/graphics/tinygl/zbuffer.h b/graphics/tinygl/zbuffer.h
index 70f1ede77a..ae5f1984b3 100644
--- a/graphics/tinygl/zbuffer.h
+++ b/graphics/tinygl/zbuffer.h
@@ -29,8 +29,8 @@
 #ifndef GRAPHICS_TINYGL_ZBUFFER_H_
 #define GRAPHICS_TINYGL_ZBUFFER_H_
 
-#include "graphics/pixelbuffer.h"
 #include "graphics/surface.h"
+#include "graphics/tinygl/pixelbuffer.h"
 #include "graphics/tinygl/texelbuffer.h"
 #include "graphics/tinygl/gl.h"