(svn r10132) -Codechange: split out the last direct video-buffer read access to the blitter-layer

-Add: added a new renderer and blitter to make room for some optimized bpp
-Fix: fill the alpha channel in the grf-spriteloader

2 files changed, 112 insertions, 0 deletions

diff --git a/src/renderer/32bpp.cpp b/src/renderer/32bpp.cpp
new file mode 100644
index 000000000..1d1d78e6a
--- /dev/null
+++ b/src/renderer/32bpp.cpp
@@ -0,0 +1,77 @@
+#include "../stdafx.h"
+#include "../gfx.h"
+#include "32bpp.hpp"
+
+static FRenderer_32bpp iFRenderer_32bpp;
+
+void *Renderer_32bpp::MoveTo(const void *video, int x, int y)
+{
+	return (uint32 *)video + x + y * _screen.pitch;
+}
+
+void Renderer_32bpp::SetPixel(void *video, int x, int y, uint8 color)
+{
+	*((uint32 *)video + x + y * _screen.pitch) = LookupColourInPalette(color);
+}
+
+void Renderer_32bpp::SetPixelIfEmpty(void *video, int x, int y, uint8 color)
+{
+	uint32 *dst = (uint32 *)video + x + y * _screen.pitch;
+	if (*dst == 0) *dst = LookupColourInPalette(color);
+}
+
+void Renderer_32bpp::SetHorizontalLine(void *video, int width, uint8 color)
+{
+	uint32 *dst = (uint32 *)video;
+	uint32 color32 = LookupColourInPalette(color);
+
+	for (; width > 0; width--) {
+		*dst = color32;
+		dst++;
+	}
+}
+
+void Renderer_32bpp::CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch)
+{
+	int direction = (height < 0) ? -1 : 1;
+	uint32 *dst = (uint32 *)video;
+	uint32 *usrc = (uint32 *)src;
+
+	height = abs(height);
+	for (; height > 0; height--) {
+		memcpy(dst, usrc, width * sizeof(uint32));
+		usrc += src_pitch * direction;
+		dst += _screen.pitch * direction;
+	}
+}
+
+void Renderer_32bpp::CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch)
+{
+	int direction = (height < 0) ? -1 : 1;
+	uint32 *udst = (uint32 *)dst;
+	uint32 *src = (uint32 *)video;
+
+	height = abs(height);
+	for (; height > 0; height--) {
+		memcpy(udst, src, width * sizeof(uint32));
+		src += _screen.pitch * direction;
+		udst += dst_pitch * direction;
+	}
+}
+
+void Renderer_32bpp::MoveBuffer(void *video_dst, const void *video_src, int width, int height)
+{
+	uint32 *dst = (uint32 *)video_dst;
+	uint32 *src = (uint32 *)video_src;
+
+	for (; height > 0; height--) {
+		memmove(dst, src, width * sizeof(uint32));
+		src += _screen.pitch;
+		dst += _screen.pitch;
+	}
+}
+
+int Renderer_32bpp::BufferSize(int width, int height)
+{
+	return width * height * sizeof(uint32);
+}
diff --git a/src/renderer/32bpp.hpp b/src/renderer/32bpp.hpp
new file mode 100644
index 000000000..7f0283754
--- /dev/null
+++ b/src/renderer/32bpp.hpp
@@ -0,0 +1,35 @@
+/* $Id$ */
+
+/** @file 32bpp.hpp */
+
+#ifndef RENDERER_32BPP_HPP
+#define RENDERER_32BPP_HPP
+
+#include "renderer.hpp"
+
+class Renderer_32bpp : public Renderer {
+public:
+	/* virtual */ void *MoveTo(const void *video, int x, int y);
+	/* virtual */ void SetPixel(void *video, int x, int y, uint8 color);
+	/* virtual */ void SetPixelIfEmpty(void *video, int x, int y, uint8 color);
+	/* virtual */ void SetHorizontalLine(void *video, int width, uint8 color);
+	/* virtual */ void CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch);
+	/* virtual */ void CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch);
+	/* virtual */ void MoveBuffer(void *video_dst, const void *video_src, int width, int height);
+	/* virtual */ int BufferSize(int width, int height);
+
+	static inline uint32 LookupColourInPalette(uint8 index) {
+		#define ARGB(a, r, g, b) ((((a) << 24) & 0xFF000000) | (((r) << 16) & 0x00FF0000) | (((g) << 8) & 0x0000FF00) | ((b) & 0x000000FF))
+		if (index == 0) return 0x00000000;
+		return ARGB(0xFF, _cur_palette[index].r, _cur_palette[index].g, _cur_palette[index].b);
+	}
+};
+
+class FRenderer_32bpp: public RendererFactory<FRenderer_32bpp> {
+public:
+	/* virtual */ const char *GetName() { return "32bpp"; }
+
+	/* virtual */ Renderer *CreateInstance() { return new Renderer_32bpp(); }
+};
+
+#endif /* RENDERER_32BPP_HPP */