Remove SDL_gfxBlitFunc

Closes flareteam#1380

CMakeLists.txt

@@ -161,7 +161,6 @@ Set (FLARE_SOURCES
 	./src/RenderDevice.cpp
 	./src/RenderDeviceList.cpp
 	./src/SaveLoad.cpp
-	./src/SDL_gfxBlitFunc.c
 	./src/SDLInputState.cpp
 	./src/SDLSoftwareRenderDevice.cpp
 	./src/SDLSoundManager.cpp

flare-android-project/jni/src/Android.mk

@@ -85,7 +85,6 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
 	../../../src/RenderDevice.cpp \
 	../../../src/RenderDeviceList.cpp \
 	../../../src/SaveLoad.cpp \
-	../../../src/SDL_gfxBlitFunc.c \
 	../../../src/SDLInputState.cpp \
 	../../../src/SDLHardwareRenderDevice.cpp \
 	../../../src/SDLSoftwareRenderDevice.cpp \

src/MenuManager.cpp

@@ -186,7 +186,7 @@ void MenuManager::setDragIcon(int icon_id) {
 
 		icons->setClip(src);
 		icons->setDest(dest);
-		render_device->renderToImage(icons->getGraphics(), src, drag_icon->getGraphics(), dest, true);
+		render_device->renderToImage(icons->getGraphics(), src, drag_icon->getGraphics(), dest);
 	}
 }
 

src/RenderDevice.h

@@ -192,8 +192,7 @@ class RenderDevice {
 	/** Screen operations */
 	virtual int render(Sprite* r) = 0;
 	virtual int render(Renderable& r, Rect dest) = 0;
-	virtual int renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest,
-							  bool dest_is_transparent = false) = 0;
+	virtual int renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest) = 0;
 	virtual int renderText(FontStyle *font_style, const std::string& text, Color color, Rect& dest) = 0;
 	virtual Image* renderTextToImage(FontStyle* font_style, const std::string& text, Color color, bool blended = true) = 0;
 	virtual void blankScreen() = 0;

src/SDLFontEngine.cpp

@@ -144,8 +144,7 @@ void SDLFontEngine::render(const std::string& text, int x, int y, int justify, I
 
 	// Render text graphics into target
 	clip = temp->getClip();
-	render_device->renderToImage(temp->getGraphics(), clip,
-								 target, dest_rect, active_font->blend);
+	render_device->renderToImage(temp->getGraphics(), clip, target, dest_rect);
 
 	// text is cached, we can free temp resource
 	delete temp;

src/SDLHardwareRenderDevice.cpp

@@ -335,18 +335,13 @@ int SDLHardwareRenderDevice::render(Sprite *r) {
 	return SDL_RenderCopy(renderer, static_cast<SDLHardwareImage *>(r->getGraphics())->surface, &src, &dest);
 }
 
-int SDLHardwareRenderDevice::renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest, bool dest_is_transparent) {
+int SDLHardwareRenderDevice::renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest) {
 	if (!src_image || !dest_image)
 		return -1;
 
 	if (SDL_SetRenderTarget(renderer, static_cast<SDLHardwareImage *>(dest_image)->surface) != 0)
 		return -1;
 
-	if (dest_is_transparent) {
-		// do nothing
-		// this block is here to suppress an unused variable compiler warning
-	}
-
 	dest.w = src.w;
 	dest.h = src.h;
     SDL_Rect _src = src;

src/SDLHardwareRenderDevice.h

@@ -70,7 +70,7 @@ class SDLHardwareRenderDevice : public RenderDevice {
 
 	virtual int render(Renderable& r, Rect dest);
 	virtual int render(Sprite* r);
-	virtual int renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest, bool dest_is_transparent = false);
+	virtual int renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest);
 
 	int renderText(FontStyle *font_style, const std::string& text, Color color, Rect& dest);
 	Image *renderTextToImage(FontStyle* font_style, const std::string& text, Color color, bool blended = true);

src/SDLSoftwareRenderDevice.cpp

@@ -22,7 +22,6 @@ FLARE.  If not, see http://www.gnu.org/licenses/
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "SDL_gfxBlitFunc.h"
 
 #include "SharedResources.h"
 #include "Settings.h"
@@ -348,18 +347,14 @@ int SDLSoftwareRenderDevice::render(Sprite *r) {
 	return SDL_BlitSurface(static_cast<SDLSoftwareImage *>(r->getGraphics())->surface, &src, screen, &dest);
 }
 
-int SDLSoftwareRenderDevice::renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest, bool dest_is_transparent) {
+int SDLSoftwareRenderDevice::renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest) {
 	if (!src_image || !dest_image) return -1;
 
 	SDL_Rect _src = src;
 	SDL_Rect _dest = dest;
 
-	if (dest_is_transparent)
-		return SDL_gfxBlitRGBA(static_cast<SDLSoftwareImage *>(src_image)->surface, &_src,
-							   static_cast<SDLSoftwareImage *>(dest_image)->surface, &_dest);
-	else
-		return SDL_BlitSurface(static_cast<SDLSoftwareImage *>(src_image)->surface, &_src,
-							   static_cast<SDLSoftwareImage *>(dest_image)->surface, &_dest);
+	return SDL_BlitSurface(static_cast<SDLSoftwareImage *>(src_image)->surface, &_src,
+						   static_cast<SDLSoftwareImage *>(dest_image)->surface, &_dest);
 }
 
 int SDLSoftwareRenderDevice::renderText(

src/SDLSoftwareRenderDevice.h

@@ -68,7 +68,7 @@ class SDLSoftwareRenderDevice : public RenderDevice {
 
 	virtual int render(Renderable& r, Rect dest);
 	virtual int render(Sprite* r);
-	virtual int renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest, bool dest_is_transparent = false);
+	virtual int renderToImage(Image* src_image, Rect& src, Image* dest_image, Rect& dest);
 
 	int renderText(FontStyle *font_style, const std::string& text, Color color, Rect& dest);
 	Image* renderTextToImage(FontStyle* font_style, const std::string& text, Color color, bool blended = true);