Skip to content

L
libSDL
Commit 7714f3b0 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Date: Sat, 20 Dec 2008 23:25:19 +0100 

From: Couriersud
Subject: 32 & 16 bit versions of blendrect and blendline

attached are 32, 16 and 15 bit versions of the blendrect and blendline
functionality. There was an issue with the bresenham alg. in drawline
which I also fixed.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403358
parent 8bf6fb5f
Hide whitespace changes
Inline Side-by-side
Showing with 311 additions and 10 deletions
src/video/SDL_blendline.c
View file @ 7714f3b0
...@@ -24,11 +24,117 @@ ...@@ -24,11 +24,117 @@
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_blit.h" #include "SDL_blit.h"
#define ABS(_x) ((_x) < 0 ? -(_x) : (_x))
#define SWAP(_x, _y) do { int tmp; tmp = _x; _x = _y; _y = tmp; } while (0)
#define BRESENHAM(x0, y0, x1, y1, op) \
{ \
int deltax, deltay, steep, error, xstep, ystep, x, y; \
\
deltax = ABS(x1 - x0); \
deltay = ABS(y1 - y0); \
steep = (deltay > deltax); \
if (steep) { \
SWAP(x0, y0); \
SWAP(x1, y1); \
SWAP(deltax, deltay); \
} \
error = (x1 - x0) / 2; \
y = y0; \
if (x0 > x1) { \
xstep = -1; \
} else { \
xstep = 1; \
} \
if (y0 < y1) { \
ystep = 1; \
} else { \
ystep = -1; \
} \
if (!steep) { \
for (x = x0; x != x1; x += xstep) { \
op(x, y); \
error -= deltay; \
if (error < 0) { \
y += ystep; \
error += deltax; \
} \
} \
} else { \
for (x = x0; x != x1; x += xstep) { \
op(y, x); \
error -= deltay; \
if (error < 0) { \
y += ystep; \
error += deltax; \
} \
} \
} \
}
#define MUL(_a, _b) (((Uint16)(_a)*(Uint16)(_b))/255)
#define SHIFTAND(_v, _s, _a) (((_v)>>(_s)) & _a)
#define SETPIXEL_MASK(x, y, type, bpp, rshift, gshift, bshift, rmask, gmask, bmask) \
do { \
type *pixel = (type *)(dst->pixels + y * dst->pitch + x * bpp); \
if (a) { \
*pixel = (r<<rshift) | (g<<gshift) | (b<<bshift); \
} \
} while (0)
#define SETPIXEL_BLEND(x, y, type, bpp, rshift, gshift, bshift, rmask, gmask, bmask) \
do { \
type *pixel = (type *)(dst->pixels + y * dst->pitch + x * bpp); \
Uint8 sr = MUL(inva, SHIFTAND(*pixel, rshift, rmask)) + (Uint16) r; \
Uint8 sg = MUL(inva, SHIFTAND(*pixel, gshift, gmask)) + (Uint16) g; \
Uint8 sb = MUL(inva, SHIFTAND(*pixel, bshift, bmask)) + (Uint16) b; \
*pixel = (sr<<rshift) | (sg<<gshift) | (sb<<bshift); \
} while (0)
#define SETPIXEL_ADD(x, y, type, bpp, rshift, gshift, bshift, rmask, gmask, bmask) \
do { \
type *pixel = (type *)(dst->pixels + y * dst->pitch + x * bpp); \
Uint16 sr = SHIFTAND(*pixel, rshift, rmask) + (Uint16) r; \
Uint16 sg = SHIFTAND(*pixel, gshift, gmask) + (Uint16) g; \
Uint16 sb = SHIFTAND(*pixel, bshift, bmask) + (Uint16) b; \
if (sr>rmask) sr = rmask; \
if (sg>gmask) sg = gmask; \
if (sb>bmask) sb = bmask; \
*pixel = (sr<<rshift) | (sg<<gshift) | (sb<<bshift); \
} while (0)
#define SETPIXEL_MOD(x, y, type, bpp, rshift, gshift, bshift, rmask, gmask, bmask) \
do { \
type *pixel = (type *)(dst->pixels + y * dst->pitch + x * bpp); \
Uint8 sr = MUL(SHIFTAND(*pixel, rshift, rmask), r); \
Uint8 sg = MUL(SHIFTAND(*pixel, gshift, gmask), g); \
Uint8 sb = MUL(SHIFTAND(*pixel, bshift, bmask), b); \
*pixel = (sr<<rshift) | (sg<<gshift) | (sb<<bshift); \
} while (0)
#define SETPIXEL15_MASK(x, y) SETPIXEL_MASK(x, y, Uint16, 2, 10, 5, 0, 0x1f, 0x1f, 0x1f);
#define SETPIXEL15_BLEND(x, y) SETPIXEL_BLEND(x, y, Uint16, 2, 10, 5, 0, 0x1f, 0x1f, 0x1f);
#define SETPIXEL15_ADD(x, y) SETPIXEL_ADD(x, y, Uint16, 2, 10, 5, 0, 0x1f, 0x1f, 0x1f);
#define SETPIXEL15_MOD(x, y) SETPIXEL_MOD(x, y, Uint16, 2, 10, 5, 0, 0x1f, 0x1f, 0x1f);
#define SETPIXEL16_MASK(x, y) SETPIXEL_MASK(x, y, Uint16, 2, 11, 5, 0, 0x1f, 0x3f, 0x1f);
#define SETPIXEL16_BLEND(x, y) SETPIXEL_BLEND(x, y, Uint16, 2, 11, 5, 0, 0x1f, 0x3f, 0x1f);
#define SETPIXEL16_ADD(x, y) SETPIXEL_ADD(x, y, Uint16, 2, 11, 5, 0, 0x1f, 0x3f, 0x1f);
#define SETPIXEL16_MOD(x, y) SETPIXEL_MOD(x, y, Uint16, 2, 11, 5, 0, 0x1f, 0x3f, 0x1f);
#define SETPIXEL32_MASK(x, y) SETPIXEL_MASK(x, y, Uint32, 4, 16, 8, 0, 0xff, 0xff, 0xff);
#define SETPIXEL32_BLEND(x, y) SETPIXEL_BLEND(x, y, Uint32, 4, 16, 8, 0, 0xff, 0xff, 0xff);
#define SETPIXEL32_ADD(x, y) SETPIXEL_ADD(x, y, Uint32, 4, 16, 8, 0, 0xff, 0xff, 0xff);
#define SETPIXEL32_MOD(x, y) SETPIXEL_MOD(x, y, Uint32, 4, 16, 8, 0, 0xff, 0xff, 0xff);
int int
SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2,
int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
{ {
Uint8 inva = 0xff - a;
/* This function doesn't work on surfaces < 8 bpp */ /* This function doesn't work on surfaces < 8 bpp */
if (dst->format->BitsPerPixel < 8) { if (dst->format->BitsPerPixel < 8) {
SDL_SetError("SDL_BlendLine(): Unsupported surface format"); SDL_SetError("SDL_BlendLine(): Unsupported surface format");
...@@ -42,8 +148,71 @@ SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, ...@@ -42,8 +148,71 @@ SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2,
} }
*/ */
SDL_Unsupported(); if ((blendMode == SDL_BLENDMODE_BLEND)
return -1; || (blendMode == SDL_BLENDMODE_ADD)) {
r = MUL(r, a);
g = MUL(g, a);
b = MUL(b, a);
}
switch (dst->format->BitsPerPixel) {
case 15:
switch (blendMode) {
case SDL_BLENDMODE_MASK:
BRESENHAM(x1, y1, x2, y2, SETPIXEL15_MASK);
break;
case SDL_BLENDMODE_BLEND:
BRESENHAM(x1, y1, x2, y2, SETPIXEL15_BLEND);
break;
case SDL_BLENDMODE_ADD:
BRESENHAM(x1, y1, x2, y2, SETPIXEL15_ADD);
break;
case SDL_BLENDMODE_MOD:
BRESENHAM(x1, y1, x2, y2, SETPIXEL15_MOD);
break;
}
break;
case 16:
switch (blendMode) {
case SDL_BLENDMODE_MASK:
BRESENHAM(x1, y1, x2, y2, SETPIXEL16_MASK);
break;
case SDL_BLENDMODE_BLEND:
BRESENHAM(x1, y1, x2, y2, SETPIXEL16_BLEND);
break;
case SDL_BLENDMODE_ADD:
BRESENHAM(x1, y1, x2, y2, SETPIXEL16_ADD);
break;
case SDL_BLENDMODE_MOD:
BRESENHAM(x1, y1, x2, y2, SETPIXEL16_MOD);
break;
}
break;
case 24:
case 32:
if (dst->format->BytesPerPixel != 4) {
SDL_Unsupported();
return -1;
}
switch (blendMode) {
case SDL_BLENDMODE_MASK:
BRESENHAM(x1, y1, x2, y2, SETPIXEL32_MASK);
break;
case SDL_BLENDMODE_BLEND:
BRESENHAM(x1, y1, x2, y2, SETPIXEL32_BLEND);
break;
case SDL_BLENDMODE_ADD:
BRESENHAM(x1, y1, x2, y2, SETPIXEL32_ADD);
break;
case SDL_BLENDMODE_MOD:
BRESENHAM(x1, y1, x2, y2, SETPIXEL32_MOD);
break;
}
break;
default:
SDL_Unsupported();
return -1;
}
return 0;
} }
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
src/video/SDL_blendrect.c
View file @ 7714f3b0
...@@ -24,11 +24,79 @@ ...@@ -24,11 +24,79 @@
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_blit.h" #include "SDL_blit.h"
#define MUL(_a, _b) (((Uint16)(_a)*(Uint16)(_b))/255)
#define SHIFTAND(_v, _s, _a) (((_v)>>(_s)) & (_a))
#define SETPIXEL_MASK(p, type, bpp, rshift, gshift, bshift, rmask, gmask, bmask) \
do { \
if (a) { \
p = (r<<rshift) | (g<<gshift) | (b<<bshift); \
} \
} while (0)
#define SETPIXEL_BLEND(p, type, bpp, rshift, gshift, bshift, rmask, gmask, bmask) \
do { \
Uint8 sr = MUL(inva, SHIFTAND(p, rshift, rmask)) + (Uint16) r; \
Uint8 sg = MUL(inva, SHIFTAND(p, gshift, gmask)) + (Uint16) g; \
Uint8 sb = MUL(inva, SHIFTAND(p, bshift, bmask)) + (Uint16) b; \
p = (sr<<rshift) | (sg<<gshift) | (sb<<bshift); \
} while (0)
#define SETPIXEL_ADD(p, type, bpp, rshift, gshift, bshift, rmask, gmask, bmask) \
do { \
Uint16 sr = SHIFTAND(p, rshift, rmask) + (Uint16) r; \
Uint16 sg = SHIFTAND(p, gshift, gmask) + (Uint16) g; \
Uint16 sb = SHIFTAND(p, bshift, bmask) + (Uint16) b; \
if (sr>rmask) sr = rmask; \
if (sg>gmask) sg = gmask; \
if (sb>bmask) sb = bmask; \
p = (sr<<rshift) | (sg<<gshift) | (sb<<bshift); \
} while (0)
#define SETPIXEL_MOD(p, type, bpp, rshift, gshift, bshift, rmask, gmask, bmask) \
do { \
Uint8 sr = MUL(SHIFTAND(p, rshift, rmask), r); \
Uint8 sg = MUL(SHIFTAND(p, gshift, gmask), g); \
Uint8 sb = MUL(SHIFTAND(p, bshift, bmask), b); \
p = (sr<<rshift) | (sg<<gshift) | (sb<<bshift); \
} while (0)
#define SETPIXEL15_MASK(p) SETPIXEL_MASK(p, Uint16, 2, 10, 5, 0, 0x1f, 0x1f, 0x1f);
#define SETPIXEL15_BLEND(p) SETPIXEL_BLEND(p, Uint16, 2, 10, 5, 0, 0x1f, 0x1f, 0x1f);
#define SETPIXEL15_ADD(p) SETPIXEL_ADD(p, Uint16, 2, 10, 5, 0, 0x1f, 0x1f, 0x1f);
#define SETPIXEL15_MOD(p) SETPIXEL_MOD(p, Uint16, 2, 10, 5, 0, 0x1f, 0x1f, 0x1f);
#define SETPIXEL16_MASK(p) SETPIXEL_MASK(p, Uint16, 2, 11, 5, 0, 0x1f, 0x3f, 0x1f);
#define SETPIXEL16_BLEND(p) SETPIXEL_BLEND(p, Uint16, 2, 11, 5, 0, 0x1f, 0x3f, 0x1f);
#define SETPIXEL16_ADD(p) SETPIXEL_ADD(p, Uint16, 2, 11, 5, 0, 0x1f, 0x3f, 0x1f);
#define SETPIXEL16_MOD(p) SETPIXEL_MOD(p, Uint16, 2, 11, 5, 0, 0x1f, 0x3f, 0x1f);
#define SETPIXEL32_MASK(p) SETPIXEL_MASK(p, Uint32, 4, 16, 8, 0, 0xff, 0xff, 0xff);
#define SETPIXEL32_BLEND(p) SETPIXEL_BLEND(p, Uint32, 4, 16, 8, 0, 0xff, 0xff, 0xff);
#define SETPIXEL32_ADD(p) SETPIXEL_ADD(p, Uint32, 4, 16, 8, 0, 0xff, 0xff, 0xff);
#define SETPIXEL32_MOD(p) SETPIXEL_MOD(p, Uint32, 4, 16, 8, 0, 0xff, 0xff, 0xff);
#define BLENDRECT(type, op) \
do { \
int y = dstrect->y; \
int h = dstrect->h; \
while (h--) { \
type *pixel = (type *)(dst->pixels + y * dst->pitch + dstrect->x * dst->format->BytesPerPixel); \
int w = dstrect->w; \
while (w--) { \
op(*pixel); \
pixel++; \
} \
y++; \
} \
} while (0)
int int
SDL_BlendRect(SDL_Surface * dst, SDL_Rect * dstrect, int blendMode, Uint8 r, SDL_BlendRect(SDL_Surface * dst, SDL_Rect * dstrect, int blendMode, Uint8 r,
Uint8 g, Uint8 b, Uint8 a) Uint8 g, Uint8 b, Uint8 a)
{ {
Uint16 inva = 0xff - a;
/* This function doesn't work on surfaces < 8 bpp */ /* This function doesn't work on surfaces < 8 bpp */
if (dst->format->BitsPerPixel < 8) { if (dst->format->BitsPerPixel < 8) {
SDL_SetError("SDL_BlendRect(): Unsupported surface format"); SDL_SetError("SDL_BlendRect(): Unsupported surface format");
...@@ -45,7 +113,71 @@ SDL_BlendRect(SDL_Surface * dst, SDL_Rect * dstrect, int blendMode, Uint8 r, ...@@ -45,7 +113,71 @@ SDL_BlendRect(SDL_Surface * dst, SDL_Rect * dstrect, int blendMode, Uint8 r,
dstrect = &dst->clip_rect; dstrect = &dst->clip_rect;
} }
SDL_Unsupported(); if ((blendMode == SDL_BLENDMODE_BLEND)
|| (blendMode == SDL_BLENDMODE_ADD)) {
r = MUL(r, a);
g = MUL(g, a);
b = MUL(b, a);
}
switch (dst->format->BitsPerPixel) {
case 15:
switch (blendMode) {
case SDL_BLENDMODE_MASK:
BLENDRECT(Uint16, SETPIXEL15_MASK);
break;
case SDL_BLENDMODE_BLEND:
BLENDRECT(Uint16, SETPIXEL15_BLEND);
break;
case SDL_BLENDMODE_ADD:
BLENDRECT(Uint16, SETPIXEL15_ADD);
break;
case SDL_BLENDMODE_MOD:
BLENDRECT(Uint16, SETPIXEL15_MOD);
break;
}
break;
case 16:
switch (blendMode) {
case SDL_BLENDMODE_MASK:
BLENDRECT(Uint16, SETPIXEL16_MASK);
break;
case SDL_BLENDMODE_BLEND:
BLENDRECT(Uint16, SETPIXEL16_BLEND);
break;
case SDL_BLENDMODE_ADD:
BLENDRECT(Uint16, SETPIXEL16_ADD);
break;
case SDL_BLENDMODE_MOD:
BLENDRECT(Uint16, SETPIXEL16_MOD);
break;
}
break;
case 24:
case 32:
if (dst->format->BytesPerPixel != 4) {
SDL_Unsupported();
return -1;
}
switch (blendMode) {
case SDL_BLENDMODE_MASK:
BLENDRECT(Uint32, SETPIXEL32_MASK);
break;
case SDL_BLENDMODE_BLEND:
BLENDRECT(Uint32, SETPIXEL32_BLEND);
break;
case SDL_BLENDMODE_ADD:
BLENDRECT(Uint32, SETPIXEL32_ADD);
break;
case SDL_BLENDMODE_MOD:
BLENDRECT(Uint32, SETPIXEL32_MOD);
break;
}
break;
default:
SDL_Unsupported();
return -1;
}
return 0;
return -1; return -1;
} }
......
src/video/SDL_drawline.c
View file @ 7714f3b0
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_blit.h" #include "SDL_blit.h"
#define ABS(x) (x < 0 ? -x : x) #define ABS(_x) ((_x) < 0 ? -(_x) : (_x))
#define SWAP(x, y) (x ^= y ^= x ^= y) #define SWAP(_x, _y) do { int tmp; tmp = _x; _x = _y; _y = tmp; } while (0)
#define BRESENHAM(x0, y0, x1, y1, op, color) \ #define BRESENHAM(x0, y0, x1, y1, op, color) \
{ \ { \
...@@ -34,16 +34,16 @@ ...@@ -34,16 +34,16 @@
\ \
deltax = ABS(x1 - x0); \ deltax = ABS(x1 - x0); \
deltay = ABS(y1 - y0); \ deltay = ABS(y1 - y0); \
steep = deltay > deltax; \ steep = (deltay > deltax); \
error = deltax / 2; \
if (steep) { \ if (steep) { \
SWAP(x0, y0); \ SWAP(x0, y0); \
SWAP(x1, y1); \ SWAP(x1, y1); \
SWAP(deltax, deltay); \
} \ } \
error = (x1 - x0) / 2; \
y = y0; \ y = y0; \
if (x0 > x1) { \ if (x0 > x1) { \
xstep = -1; \ xstep = -1; \
deltax = -deltax; \
} else { \ } else { \
xstep = 1; \ xstep = 1; \
} \ } \
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
op(x, y, color); \ op(x, y, color); \
error -= deltay; \ error -= deltay; \
if (error < 0) { \ if (error < 0) { \
y = y + ystep; \ y += ystep; \
error += deltax; \ error += deltax; \
} \ } \
} \ } \
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
op(y, x, color); \ op(y, x, color); \
error -= deltay; \ error -= deltay; \
if (error < 0) { \ if (error < 0) { \
y = y + ystep; \ y += ystep; \
error += deltax; \ error += deltax; \
} \ } \
} \ } \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment