From 03f8528315fa46c95991a34f3325d7b33ae5538c Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Sat, 02 May 2020 21:48:36 +0000
Subject: [PATCH] Update source to SDL2 2.0.12
---
source/src/render/software/SDL_blendpoint.c | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/source/src/render/software/SDL_blendpoint.c b/source/src/render/software/SDL_blendpoint.c
index 37fb498..b6a406e 100644
--- a/source/src/render/software/SDL_blendpoint.c
+++ b/source/src/render/software/SDL_blendpoint.c
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
- Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -20,7 +20,7 @@
*/
#include "../../SDL_internal.h"
-#if !SDL_RENDER_DISABLED
+#if SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED
#include "SDL_draw.h"
#include "SDL_blendpoint.h"
@@ -41,6 +41,9 @@
break;
case SDL_BLENDMODE_MOD:
DRAW_SETPIXELXY_MOD_RGB555(x, y);
+ break;
+ case SDL_BLENDMODE_MUL:
+ DRAW_SETPIXELXY_MUL_RGB555(x, y);
break;
default:
DRAW_SETPIXELXY_RGB555(x, y);
@@ -65,6 +68,9 @@
case SDL_BLENDMODE_MOD:
DRAW_SETPIXELXY_MOD_RGB565(x, y);
break;
+ case SDL_BLENDMODE_MUL:
+ DRAW_SETPIXELXY_MUL_RGB565(x, y);
+ break;
default:
DRAW_SETPIXELXY_RGB565(x, y);
break;
@@ -88,6 +94,9 @@
case SDL_BLENDMODE_MOD:
DRAW_SETPIXELXY_MOD_RGB888(x, y);
break;
+ case SDL_BLENDMODE_MUL:
+ DRAW_SETPIXELXY_MUL_RGB888(x, y);
+ break;
default:
DRAW_SETPIXELXY_RGB888(x, y);
break;
@@ -110,6 +119,9 @@
break;
case SDL_BLENDMODE_MOD:
DRAW_SETPIXELXY_MOD_ARGB8888(x, y);
+ break;
+ case SDL_BLENDMODE_MUL:
+ DRAW_SETPIXELXY_MUL_ARGB8888(x, y);
break;
default:
DRAW_SETPIXELXY_ARGB8888(x, y);
@@ -137,6 +149,9 @@
case SDL_BLENDMODE_MOD:
DRAW_SETPIXELXY2_MOD_RGB(x, y);
break;
+ case SDL_BLENDMODE_MUL:
+ DRAW_SETPIXELXY2_MUL_RGB(x, y);
+ break;
default:
DRAW_SETPIXELXY2_RGB(x, y);
break;
@@ -152,6 +167,9 @@
break;
case SDL_BLENDMODE_MOD:
DRAW_SETPIXELXY4_MOD_RGB(x, y);
+ break;
+ case SDL_BLENDMODE_MUL:
+ DRAW_SETPIXELXY4_MUL_RGB(x, y);
break;
default:
DRAW_SETPIXELXY4_RGB(x, y);
@@ -181,6 +199,9 @@
break;
case SDL_BLENDMODE_MOD:
DRAW_SETPIXELXY4_MOD_RGBA(x, y);
+ break;
+ case SDL_BLENDMODE_MUL:
+ DRAW_SETPIXELXY4_MUL_RGBA(x, y);
break;
default:
DRAW_SETPIXELXY4_RGBA(x, y);
@@ -336,6 +357,6 @@
return status;
}
-#endif /* !SDL_RENDER_DISABLED */
+#endif /* SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED */
/* vi: set ts=4 sw=4 expandtab: */
--
Gitblit v1.9.3