Skip to content

L
libSDL
Commit 422ec364 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Work in progress: merging new texture features into SDL blit system 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402624
parent 3f37bb54
Hide whitespace changes
Inline Side-by-side
Showing with 1914 additions and 2159 deletions
src/video/SDL_RLEaccel.c
View file @ 422ec364
...@@ -906,7 +906,7 @@ SDL_RLEBlit(SDL_Surface * src, SDL_Rect * srcrect, ...@@ -906,7 +906,7 @@ SDL_RLEBlit(SDL_Surface * src, SDL_Rect * srcrect,
} }
alpha = (src->flags & SDL_SRCALPHA) == SDL_SRCALPHA alpha = (src->flags & SDL_SRCALPHA) == SDL_SRCALPHA
? (src->map->cmod >> 24) : 255; ? src->map->info.a : 255;
/* if left or right edge clipping needed, call clip blit */ /* if left or right edge clipping needed, call clip blit */
if (srcrect->x || srcrect->w != src->w) { if (srcrect->x || srcrect->w != src->w) {
RLEClipBlit(w, srcbuf, dst, dstbuf, srcrect, alpha); RLEClipBlit(w, srcbuf, dst, dstbuf, srcrect, alpha);
...@@ -1715,7 +1715,7 @@ RLEColorkeySurface(SDL_Surface * surface) ...@@ -1715,7 +1715,7 @@ RLEColorkeySurface(SDL_Surface * surface)
skip = run = 0; skip = run = 0;
dst = rlebuf; dst = rlebuf;
rgbmask = ~surface->format->Amask; rgbmask = ~surface->format->Amask;
ckey = surface->map->ckey & rgbmask; ckey = surface->map->info.colorkey & rgbmask;
lastline = dst; lastline = dst;
getpix = getpixes[bpp - 1]; getpix = getpixes[bpp - 1];
w = surface->w; w = surface->w;
...@@ -1948,7 +1948,7 @@ SDL_UnRLESurface(SDL_Surface * surface, int recode) ...@@ -1948,7 +1948,7 @@ SDL_UnRLESurface(SDL_Surface * surface, int recode)
} }
/* fill it with the background colour */ /* fill it with the background colour */
SDL_FillRect(surface, NULL, surface->map->ckey); SDL_FillRect(surface, NULL, surface->map->info.colorkey);
/* now render the encoded surface */ /* now render the encoded surface */
full.x = full.y = 0; full.x = full.y = 0;
......
src/video/SDL_blit.c
View file @ 422ec364
...@@ -61,31 +61,23 @@ SDL_SoftBlit(SDL_Surface * src, SDL_Rect * srcrect, ...@@ -61,31 +61,23 @@ SDL_SoftBlit(SDL_Surface * src, SDL_Rect * srcrect,
/* Set up source and destination buffer pointers, and BLIT! */ /* Set up source and destination buffer pointers, and BLIT! */
if (okay && srcrect->w && srcrect->h) { if (okay && srcrect->w && srcrect->h) {
SDL_BlitInfo info; SDL_BlitInfo *info = &src->map->info;
SDL_loblit RunBlit;
/* Set up the blit information */ /* Set up the blit information */
info.s_pixels = (Uint8 *) src->pixels + info->src = (Uint8 *) src->pixels +
(Uint16) srcrect->y * src->pitch + (Uint16) srcrect->y * src->pitch +
(Uint16) srcrect->x * src->format->BytesPerPixel; (Uint16) srcrect->x * info->src_fmt->BytesPerPixel;
info.s_width = srcrect->w; info.src_w = srcrect->w;
info.s_height = srcrect->h; info.src_h = srcrect->h;
info.s_skip = src->pitch - info.s_width * src->format->BytesPerPixel; info.dst = (Uint8 *) dst->pixels +
info.d_pixels = (Uint8 *) dst->pixels +
(Uint16) dstrect->y * dst->pitch + (Uint16) dstrect->y * dst->pitch +
(Uint16) dstrect->x * dst->format->BytesPerPixel; (Uint16) dstrect->x * info->dst_fmt->BytesPerPixel;
info.d_width = dstrect->w; info.dst_w = dstrect->w;
info.d_height = dstrect->h; info.dst_h = dstrect->h;
info.d_skip = dst->pitch - info.d_width * dst->format->BytesPerPixel; RunBlit = (SDL_BlitFunc) src->map->data;
info.src = src->format;
info.table = src->map->table;
info.dst = dst->format;
info.ckey = src->map->ckey;
info.cmod = src->map->cmod;
RunBlit = (SDL_loblit) src->map->data;
/* Run the actual software blit */ /* Run the actual software blit */
RunBlit(&info); RunBlit(info);
} }
/* We need to unlock the surfaces if they're locked */ /* We need to unlock the surfaces if they're locked */
...@@ -124,50 +116,67 @@ SDL_UseAltivecPrefetch() ...@@ -124,50 +116,67 @@ SDL_UseAltivecPrefetch()
} }
#endif /* __MACOSX__ */ #endif /* __MACOSX__ */
static SDL_loblit static SDL_BlitFunc
SDL_ChooseBlitFunc(SDL_BlitEntry * entries, int count) SDL_ChooseBlitFunc(Uint32 src_format, Uint32 dst_format, int flags, SDL_BlitEntry * entries)
{ {
int i; int i;
static Uint32 features = 0xffffffff; static Uint32 features = 0xffffffff;
/* Get the available CPU features */
if (features == 0xffffffff) { if (features == 0xffffffff) {
const char *override = SDL_getenv("SDL_BLIT_FEATURES"); const char *override = SDL_getenv("SDL_BLIT_CPU_FEATURES");
features = SDL_BLIT_ANY; features = SDL_CPU_ANY;
/* Allow an override for testing .. */ /* Allow an override for testing .. */
if (override) { if (override) {
SDL_sscanf(override, "%u", &features); SDL_sscanf(override, "%u", &features);
} else { } else {
if (SDL_HasMMX()) { if (SDL_HasMMX()) {
features |= SDL_BLIT_MMX; features |= SDL_CPU_MMX;
}
if (SDL_Has3DNow()) {
features |= SDL_CPU_3DNOW;
} }
if (SDL_HasSSE()) { if (SDL_HasSSE()) {
features |= SDL_BLIT_SSE; features |= SDL_CPU_SSE;
}
if (SDL_HasSSE2()) {
features |= SDL_CPU_SSE2;
} }
if (SDL_HasAltiVec()) { if (SDL_HasAltiVec()) {
if (SDL_UseAltivecPrefetch()) { if (SDL_UseAltivecPrefetch()) {
features |= SDL_BLIT_ALTIVEC_PREFETCH; features |= SDL_CPU_ALTIVEC_PREFETCH;
} else { } else {
features |= SDL_BLIT_ALTIVEC_NOPREFETCH; features |= SDL_CPU_ALTIVEC_NOPREFETCH;
} }
} }
} }
} }
for (i = count; i > 0; --i) { for (i = 0; entries[i].blit; ++i) {
if (features & entries[i].features) { if (src_format != entries[i].src_format) {
return entries[i].blit; continue;
}
if (dst_format != entries[i].dst_format) {
continue;
}
if ((flags & entries[i].flags) != flags) {
continue;
} }
if (!(features & entries[i].cpu)) {
continue;
}
return entries[i].func;
} }
return entries[0].blit; return NULL;
} }
/* Figure out which of many blit routines to set up on a surface */ /* Figure out which of many blit routines to set up on a surface */
int int
SDL_CalculateBlit(SDL_Surface * surface) SDL_CalculateBlit(SDL_Surface * surface)
{ {
SDL_loblit blit = NULL; SDL_BlitFunc blit = NULL;
int blit_index; int blit_index;
/* Clean everything out to start */ /* Clean everything out to start */
...@@ -210,6 +219,10 @@ SDL_CalculateBlit(SDL_Surface * surface) ...@@ -210,6 +219,10 @@ SDL_CalculateBlit(SDL_Surface * surface)
} }
} }
} }
if (blit == NULL) {
blit = SDL_ChooseBlitFunc(src_format, dst_format, surface->map->info.flags, SDL_GeneratedBlitFuncTable);
}
/* Make sure we have a blit function */ /* Make sure we have a blit function */
if (blit == NULL) { if (blit == NULL) {
SDL_InvalidateMap(surface->map); SDL_InvalidateMap(surface->map);
......
src/video/SDL_blit.h
View file @ 422ec364
...@@ -33,67 +33,74 @@ ...@@ -33,67 +33,74 @@
#ifdef __SSE__ #ifdef __SSE__
#include <xmmintrin.h> #include <xmmintrin.h>
#endif #endif
#ifdef __SSE2__
#include <emmintrin.h>
#endif
#include "SDL_cpuinfo.h" #include "SDL_cpuinfo.h"
#include "SDL_endian.h" #include "SDL_endian.h"
/* The structure passed to the low level blit functions */ /* SDL blit copy flags */
typedef struct #define SDL_COPY_MODULATE_COLOR 0x0001
{ #define SDL_COPY_MODULATE_ALPHA 0x0002
Uint8 *s_pixels; #define SDL_COPY_MASK 0x0010
int s_width; #define SDL_COPY_BLEND 0x0020
int s_height; #define SDL_COPY_ADD 0x0040
int s_skip; #define SDL_COPY_MOD 0x0080
Uint8 *d_pixels; #define SDL_COPY_COLORKEY 0x0100
int d_width; #define SDL_COPY_NEAREST 0x0200
int d_height;
int d_skip; /* SDL blit CPU flags */
SDL_PixelFormat *src; #define SDL_CPU_ANY 0x0000
#define SDL_CPU_MMX 0x0001
#define SDL_CPU_3DNOW 0x0002
#define SDL_CPU_SSE 0x0004
#define SDL_CPU_SSE2 0x0008
#define SDL_CPU_ALTIVEC_PREFETCH 0x0010
#define SDL_CPU_ALTIVEC_NOPREFETCH 0x0020
typedef struct {
Uint8 *src;
int src_w, src_h;
int src_pitch;
Uint8 *dst;
int dst_w, dst_h;
int dst_pitch;
SDL_PixelFormat *src_fmt;
SDL_PixelFormat *dst_fmt;
Uint8 *table; Uint8 *table;
SDL_PixelFormat *dst; int flags;
Uint32 ckey, cmod; Uint32 colorkey;
Uint8 r, g, b, a;
} SDL_BlitInfo; } SDL_BlitInfo;
/* The type definition for the low level blit functions */ typedef void (SDLCALL * SDL_BlitFunc)(SDL_BlitInfo *info);
typedef void (*SDL_loblit) (SDL_BlitInfo * info);
typedef struct {
Uint32 src_format;
Uint32 dst_format;
int flags;
int cpu;
SDL_BlitFunc func;
} SDL_BlitFuncEntry;
/* Blit mapping definition */ /* Blit mapping definition */
typedef struct SDL_BlitMap typedef struct SDL_BlitMap
{ {
SDL_Surface *dst; SDL_Surface *dst;
int identity; int identity;
Uint8 *table;
SDL_blit blit; SDL_blit blit;
void *data; void *data;
Uint32 ckey; /* colorkey */ SDL_BlitInfo info;
Uint32 cmod; /* ARGB modulation */
/* the version count matches the destination; mismatch indicates /* the version count matches the destination; mismatch indicates
an invalid mapping */ an invalid mapping */
unsigned int format_version; unsigned int format_version;
} SDL_BlitMap; } SDL_BlitMap;
#define SDL_BLIT_ANY 0x00000000
#define SDL_BLIT_MMX 0x00000001
#define SDL_BLIT_SSE 0x00000002
#define SDL_BLIT_ALTIVEC_PREFETCH 0x00000004
#define SDL_BLIT_ALTIVEC_NOPREFETCH 0x00000008
typedef struct SDL_BlitEntry
{
Uint32 features;
SDL_loblit blit;
} SDL_BlitEntry;
/* Functions found in SDL_blit.c */ /* Functions found in SDL_blit.c */
extern int SDL_CalculateBlit(SDL_Surface * surface); extern int SDL_CalculateBlit(SDL_Surface * surface);
/* Functions found in SDL_blit_{0,1,N,A}.c */
extern SDL_loblit SDL_CalculateBlit0(SDL_Surface * surface, int complex);
extern SDL_loblit SDL_CalculateBlit1(SDL_Surface * surface, int complex);
extern SDL_loblit SDL_CalculateBlitN(SDL_Surface * surface, int complex);
extern SDL_loblit SDL_CalculateAlphaBlit(SDL_Surface * surface, int complex);
/* /*
* Useful macros for blitting routines * Useful macros for blitting routines
*/ */
......
src/video/SDL_blit_0.c
View file @ 422ec364
...@@ -35,12 +35,12 @@ BlitBto1(SDL_BlitInfo * info) ...@@ -35,12 +35,12 @@ BlitBto1(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = info->s_pixels; src = info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = info->d_pixels; dst = info->dst;
dstskip = info->d_skip; dstskip = info->dst_pitch;
map = info->table; map = info->table;
srcskip += width - (width + 7) / 8; srcskip += width - (width + 7) / 8;
...@@ -90,12 +90,12 @@ BlitBto2(SDL_BlitInfo * info) ...@@ -90,12 +90,12 @@ BlitBto2(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = info->s_pixels; src = info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = (Uint16 *) info->d_pixels; dst = (Uint16 *) info->dst;
dstskip = info->d_skip / 2; dstskip = info->dst_pitch / 2;
map = (Uint16 *) info->table; map = (Uint16 *) info->table;
srcskip += width - (width + 7) / 8; srcskip += width - (width + 7) / 8;
...@@ -125,12 +125,12 @@ BlitBto3(SDL_BlitInfo * info) ...@@ -125,12 +125,12 @@ BlitBto3(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = info->s_pixels; src = info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = info->d_pixels; dst = info->dst;
dstskip = info->d_skip; dstskip = info->dst_pitch;
map = info->table; map = info->table;
srcskip += width - (width + 7) / 8; srcskip += width - (width + 7) / 8;
...@@ -164,12 +164,12 @@ BlitBto4(SDL_BlitInfo * info) ...@@ -164,12 +164,12 @@ BlitBto4(SDL_BlitInfo * info)
int c; int c;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = info->s_pixels; src = info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = (Uint32 *) info->d_pixels; dst = (Uint32 *) info->dst;
dstskip = info->d_skip / 4; dstskip = info->dst_pitch / 4;
map = (Uint32 *) info->table; map = (Uint32 *) info->table;
srcskip += width - (width + 7) / 8; srcskip += width - (width + 7) / 8;
...@@ -194,12 +194,12 @@ BlitBto4(SDL_BlitInfo * info) ...@@ -194,12 +194,12 @@ BlitBto4(SDL_BlitInfo * info)
static void static void
BlitBto1Key(SDL_BlitInfo * info) BlitBto1Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int srcskip = info->s_skip; int srcskip = info->s_skip;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
Uint8 *palmap = info->table; Uint8 *palmap = info->table;
int c; int c;
...@@ -247,12 +247,12 @@ BlitBto1Key(SDL_BlitInfo * info) ...@@ -247,12 +247,12 @@ BlitBto1Key(SDL_BlitInfo * info)
static void static void
BlitBto2Key(SDL_BlitInfo * info) BlitBto2Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int srcskip = info->s_skip; int srcskip = info->s_skip;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
Uint8 *palmap = info->table; Uint8 *palmap = info->table;
int c; int c;
...@@ -282,12 +282,12 @@ BlitBto2Key(SDL_BlitInfo * info) ...@@ -282,12 +282,12 @@ BlitBto2Key(SDL_BlitInfo * info)
static void static void
BlitBto3Key(SDL_BlitInfo * info) BlitBto3Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int srcskip = info->s_skip; int srcskip = info->s_skip;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
Uint8 *palmap = info->table; Uint8 *palmap = info->table;
int c; int c;
...@@ -316,12 +316,12 @@ BlitBto3Key(SDL_BlitInfo * info) ...@@ -316,12 +316,12 @@ BlitBto3Key(SDL_BlitInfo * info)
static void static void
BlitBto4Key(SDL_BlitInfo * info) BlitBto4Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int srcskip = info->s_skip; int srcskip = info->s_skip;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
Uint8 *palmap = info->table; Uint8 *palmap = info->table;
int c; int c;
...@@ -351,12 +351,12 @@ BlitBto4Key(SDL_BlitInfo * info) ...@@ -351,12 +351,12 @@ BlitBto4Key(SDL_BlitInfo * info)
static void static void
BlitBtoNAlpha(SDL_BlitInfo * info) BlitBtoNAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int srcskip = info->s_skip; int srcskip = info->s_skip;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
const SDL_Color *srcpal = info->src->palette->colors; const SDL_Color *srcpal = info->src->palette->colors;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
int dstbpp; int dstbpp;
...@@ -396,12 +396,12 @@ BlitBtoNAlpha(SDL_BlitInfo * info) ...@@ -396,12 +396,12 @@ BlitBtoNAlpha(SDL_BlitInfo * info)
static void static void
BlitBtoNAlphaKey(SDL_BlitInfo * info) BlitBtoNAlphaKey(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int srcskip = info->s_skip; int srcskip = info->s_skip;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
const SDL_Color *srcpal = srcfmt->palette->colors; const SDL_Color *srcpal = srcfmt->palette->colors;
......
src/video/SDL_blit_1.c
View file @ 422ec364
...@@ -39,12 +39,12 @@ Blit1to1(SDL_BlitInfo * info) ...@@ -39,12 +39,12 @@ Blit1to1(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = info->s_pixels; src = info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = info->d_pixels; dst = info->dst;
dstskip = info->d_skip; dstskip = info->dst_pitch;
map = info->table; map = info->table;
while (height--) { while (height--) {
...@@ -90,12 +90,12 @@ Blit1to2(SDL_BlitInfo * info) ...@@ -90,12 +90,12 @@ Blit1to2(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = info->s_pixels; src = info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = info->d_pixels; dst = info->dst;
dstskip = info->d_skip; dstskip = info->dst_pitch;
map = (Uint16 *) info->table; map = (Uint16 *) info->table;
#ifdef USE_DUFFS_LOOP #ifdef USE_DUFFS_LOOP
...@@ -196,12 +196,12 @@ Blit1to3(SDL_BlitInfo * info) ...@@ -196,12 +196,12 @@ Blit1to3(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = info->s_pixels; src = info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = info->d_pixels; dst = info->dst;
dstskip = info->d_skip; dstskip = info->dst_pitch;
map = info->table; map = info->table;
while (height--) { while (height--) {
...@@ -244,12 +244,12 @@ Blit1to4(SDL_BlitInfo * info) ...@@ -244,12 +244,12 @@ Blit1to4(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = info->s_pixels; src = info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = (Uint32 *) info->d_pixels; dst = (Uint32 *) info->dst;
dstskip = info->d_skip / 4; dstskip = info->dst_pitch / 4;
map = (Uint32 *) info->table; map = (Uint32 *) info->table;
while (height--) { while (height--) {
...@@ -283,12 +283,12 @@ Blit1to4(SDL_BlitInfo * info) ...@@ -283,12 +283,12 @@ Blit1to4(SDL_BlitInfo * info)
static void static void
Blit1to1Key(SDL_BlitInfo * info) Blit1to1Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint8 *palmap = info->table; Uint8 *palmap = info->table;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
...@@ -330,12 +330,12 @@ Blit1to1Key(SDL_BlitInfo * info) ...@@ -330,12 +330,12 @@ Blit1to1Key(SDL_BlitInfo * info)
static void static void
Blit1to2Key(SDL_BlitInfo * info) Blit1to2Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint16 *palmap = (Uint16 *) info->table; Uint16 *palmap = (Uint16 *) info->table;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
...@@ -362,12 +362,12 @@ Blit1to2Key(SDL_BlitInfo * info) ...@@ -362,12 +362,12 @@ Blit1to2Key(SDL_BlitInfo * info)
static void static void
Blit1to3Key(SDL_BlitInfo * info) Blit1to3Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint8 *palmap = info->table; Uint8 *palmap = info->table;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
int o; int o;
...@@ -395,12 +395,12 @@ Blit1to3Key(SDL_BlitInfo * info) ...@@ -395,12 +395,12 @@ Blit1to3Key(SDL_BlitInfo * info)
static void static void
Blit1to4Key(SDL_BlitInfo * info) Blit1to4Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint32 *palmap = (Uint32 *) info->table; Uint32 *palmap = (Uint32 *) info->table;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
...@@ -427,12 +427,12 @@ Blit1to4Key(SDL_BlitInfo * info) ...@@ -427,12 +427,12 @@ Blit1to4Key(SDL_BlitInfo * info)
static void static void
Blit1toNAlpha(SDL_BlitInfo * info) Blit1toNAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
const SDL_Color *srcpal = info->src->palette->colors; const SDL_Color *srcpal = info->src->palette->colors;
int dstbpp; int dstbpp;
...@@ -468,12 +468,12 @@ Blit1toNAlpha(SDL_BlitInfo * info) ...@@ -468,12 +468,12 @@ Blit1toNAlpha(SDL_BlitInfo * info)
static void static void
Blit1toNAlphaKey(SDL_BlitInfo * info) Blit1toNAlphaKey(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
const SDL_Color *srcpal = info->src->palette->colors; const SDL_Color *srcpal = info->src->palette->colors;
......
src/video/SDL_blit_A.c
View file @ 422ec364
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
static void static void
BlitNto1SurfaceAlpha(SDL_BlitInfo * info) BlitNto1SurfaceAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint8 *palmap = info->table; Uint8 *palmap = info->table;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
...@@ -86,12 +86,12 @@ BlitNto1SurfaceAlpha(SDL_BlitInfo * info) ...@@ -86,12 +86,12 @@ BlitNto1SurfaceAlpha(SDL_BlitInfo * info)
static void static void
BlitNto1PixelAlpha(SDL_BlitInfo * info) BlitNto1PixelAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint8 *palmap = info->table; Uint8 *palmap = info->table;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
...@@ -142,12 +142,12 @@ BlitNto1PixelAlpha(SDL_BlitInfo * info) ...@@ -142,12 +142,12 @@ BlitNto1PixelAlpha(SDL_BlitInfo * info)
static void static void
BlitNto1SurfaceAlphaKey(SDL_BlitInfo * info) BlitNto1SurfaceAlphaKey(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint8 *palmap = info->table; Uint8 *palmap = info->table;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
...@@ -203,12 +203,12 @@ BlitNto1SurfaceAlphaKey(SDL_BlitInfo * info) ...@@ -203,12 +203,12 @@ BlitNto1SurfaceAlphaKey(SDL_BlitInfo * info)
static void static void
BlitRGBtoRGBSurfaceAlpha128MMX(SDL_BlitInfo * info) BlitRGBtoRGBSurfaceAlpha128MMX(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
Uint32 dalpha = info->dst->Amask; Uint32 dalpha = info->dst->Amask;
__m64 src1, src2, dst1, dst2, lmask, hmask, dsta; __m64 src1, src2, dst1, dst2, lmask, hmask, dsta;
...@@ -267,12 +267,12 @@ BlitRGBtoRGBSurfaceAlphaMMX(SDL_BlitInfo * info) ...@@ -267,12 +267,12 @@ BlitRGBtoRGBSurfaceAlphaMMX(SDL_BlitInfo * info)
/* only call a128 version when R,G,B occupy lower bits */ /* only call a128 version when R,G,B occupy lower bits */
BlitRGBtoRGBSurfaceAlpha128MMX(info); BlitRGBtoRGBSurfaceAlpha128MMX(info);
} else { } else {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
Uint32 dalpha = df->Amask; Uint32 dalpha = df->Amask;
Uint32 amult; Uint32 amult;
...@@ -356,12 +356,12 @@ BlitRGBtoRGBSurfaceAlphaMMX(SDL_BlitInfo * info) ...@@ -356,12 +356,12 @@ BlitRGBtoRGBSurfaceAlphaMMX(SDL_BlitInfo * info)
static void static void
BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info) BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
SDL_PixelFormat *sf = info->src; SDL_PixelFormat *sf = info->src;
Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask; Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask;
Uint32 amask = sf->Amask; Uint32 amask = sf->Amask;
...@@ -542,11 +542,11 @@ calc_swizzle32(const SDL_PixelFormat * srcfmt, const SDL_PixelFormat * dstfmt) ...@@ -542,11 +542,11 @@ calc_swizzle32(const SDL_PixelFormat * srcfmt, const SDL_PixelFormat * dstfmt)
static void static void
Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info) Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info)
{ {
int height = info->d_height; int height = info->dst_h;
Uint8 *src = (Uint8 *) info->s_pixels; Uint8 *src = (Uint8 *) info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = (Uint8 *) info->d_pixels; Uint8 *dst = (Uint8 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
vector unsigned char v0 = vec_splat_u8(0); vector unsigned char v0 = vec_splat_u8(0);
...@@ -617,7 +617,7 @@ Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info) ...@@ -617,7 +617,7 @@ Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info)
vector unsigned char valigner; vector unsigned char valigner;
vector unsigned char vsrc; vector unsigned char vsrc;
vector unsigned char voverflow; vector unsigned char voverflow;
int width = info->d_width; int width = info->dst_w;
#define ONE_PIXEL_BLEND(condition, widthvar) \ #define ONE_PIXEL_BLEND(condition, widthvar) \
while (condition) { \ while (condition) { \
...@@ -718,11 +718,11 @@ Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info) ...@@ -718,11 +718,11 @@ Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info)
static void static void
Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info) Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info)
{ {
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
unsigned sA = (info->cmod >> 24); unsigned sA = (info->cmod >> 24);
...@@ -766,7 +766,7 @@ Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info) ...@@ -766,7 +766,7 @@ Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info)
vrgbmask = vec_splat(vrgbmask, 0); vrgbmask = vec_splat(vrgbmask, 0);
while (height--) { while (height--) {
int width = info->d_width; int width = info->dst_w;
#define ONE_PIXEL_BLEND(condition, widthvar) \ #define ONE_PIXEL_BLEND(condition, widthvar) \
while (condition) { \ while (condition) { \
Uint32 Pixel; \ Uint32 Pixel; \
...@@ -844,12 +844,12 @@ Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info) ...@@ -844,12 +844,12 @@ Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info)
static void static void
Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info) Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
vector unsigned char mergePermute; vector unsigned char mergePermute;
...@@ -875,7 +875,7 @@ Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info) ...@@ -875,7 +875,7 @@ Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info)
vsdstPermute = calc_swizzle32(dstfmt, NULL); vsdstPermute = calc_swizzle32(dstfmt, NULL);
while (height--) { while (height--) {
width = info->d_width; width = info->dst_w;
#define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \ #define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \
Uint32 Pixel; \ Uint32 Pixel; \
unsigned sR, sG, sB, dR, dG, dB, sA, dA; \ unsigned sR, sG, sB, dR, dG, dB, sA, dA; \
...@@ -942,12 +942,12 @@ Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info) ...@@ -942,12 +942,12 @@ Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info)
static void static void
BlitRGBtoRGBPixelAlphaAltivec(SDL_BlitInfo * info) BlitRGBtoRGBPixelAlphaAltivec(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
vector unsigned char mergePermute; vector unsigned char mergePermute;
vector unsigned char valphaPermute; vector unsigned char valphaPermute;
vector unsigned char valphamask; vector unsigned char valphamask;
...@@ -965,7 +965,7 @@ BlitRGBtoRGBPixelAlphaAltivec(SDL_BlitInfo * info) ...@@ -965,7 +965,7 @@ BlitRGBtoRGBPixelAlphaAltivec(SDL_BlitInfo * info)
vpixelmask = vec_nor(valphamask, v0); vpixelmask = vec_nor(valphamask, v0);
while (height--) { while (height--) {
width = info->d_width; width = info->dst_w;
#define ONE_PIXEL_BLEND(condition, widthvar) \ #define ONE_PIXEL_BLEND(condition, widthvar) \
while ((condition)) { \ while ((condition)) { \
Uint32 dalpha; \ Uint32 dalpha; \
...@@ -1040,11 +1040,11 @@ static void ...@@ -1040,11 +1040,11 @@ static void
Blit32to32SurfaceAlphaAltivec(SDL_BlitInfo * info) Blit32to32SurfaceAlphaAltivec(SDL_BlitInfo * info)
{ {
/* XXX : 6 */ /* XXX : 6 */
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
unsigned sA = (info->cmod >> 24); unsigned sA = (info->cmod >> 24);
...@@ -1076,7 +1076,7 @@ Blit32to32SurfaceAlphaAltivec(SDL_BlitInfo * info) ...@@ -1076,7 +1076,7 @@ Blit32to32SurfaceAlphaAltivec(SDL_BlitInfo * info)
vbits = (vector unsigned char) vec_splat_s8(-1); vbits = (vector unsigned char) vec_splat_s8(-1);
while (height--) { while (height--) {
int width = info->d_width; int width = info->dst_w;
#define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \ #define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \
Uint32 Pixel; \ Uint32 Pixel; \
unsigned sR, sG, sB, dR, dG, dB; \ unsigned sR, sG, sB, dR, dG, dB; \
...@@ -1137,11 +1137,11 @@ static void ...@@ -1137,11 +1137,11 @@ static void
BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info) BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info)
{ {
unsigned alpha = (info->cmod >> 24); unsigned alpha = (info->cmod >> 24);
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
vector unsigned char mergePermute; vector unsigned char mergePermute;
vector unsigned char valpha; vector unsigned char valpha;
vector unsigned char valphamask; vector unsigned char valphamask;
...@@ -1160,7 +1160,7 @@ BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info) ...@@ -1160,7 +1160,7 @@ BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info)
valpha = vec_splat(valpha, 0); valpha = vec_splat(valpha, 0);
while (height--) { while (height--) {
int width = info->d_width; int width = info->dst_w;
#define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \ #define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \
Uint32 s = *srcp; \ Uint32 s = *srcp; \
Uint32 d = *dstp; \ Uint32 d = *dstp; \
...@@ -1224,12 +1224,12 @@ BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info) ...@@ -1224,12 +1224,12 @@ BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info)
static void static void
BlitRGBtoRGBSurfaceAlpha128(SDL_BlitInfo * info) BlitRGBtoRGBSurfaceAlpha128(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
while (height--) { while (height--) {
/* *INDENT-OFF* */ /* *INDENT-OFF* */
...@@ -1253,12 +1253,12 @@ BlitRGBtoRGBSurfaceAlpha(SDL_BlitInfo * info) ...@@ -1253,12 +1253,12 @@ BlitRGBtoRGBSurfaceAlpha(SDL_BlitInfo * info)
if (alpha == 128) { if (alpha == 128) {
BlitRGBtoRGBSurfaceAlpha128(info); BlitRGBtoRGBSurfaceAlpha128(info);
} else { } else {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
Uint32 s; Uint32 s;
Uint32 d; Uint32 d;
Uint32 s1; Uint32 s1;
...@@ -1321,12 +1321,12 @@ BlitRGBtoRGBSurfaceAlpha(SDL_BlitInfo * info) ...@@ -1321,12 +1321,12 @@ BlitRGBtoRGBSurfaceAlpha(SDL_BlitInfo * info)
static void static void
BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * info) BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
while (height--) { while (height--) {
/* *INDENT-OFF* */ /* *INDENT-OFF* */
...@@ -1374,12 +1374,12 @@ BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * info) ...@@ -1374,12 +1374,12 @@ BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * info)
static void static void
BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info) BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip >> 2; int dstskip = info->dst_pitch >> 2;
SDL_PixelFormat *sf = info->src; SDL_PixelFormat *sf = info->src;
Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask; Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask;
Uint32 amask = sf->Amask; Uint32 amask = sf->Amask;
...@@ -1456,12 +1456,12 @@ BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info) ...@@ -1456,12 +1456,12 @@ BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info)
static void static void
Blit16to16SurfaceAlpha128(SDL_BlitInfo * info, Uint16 mask) Blit16to16SurfaceAlpha128(SDL_BlitInfo * info, Uint16 mask)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint16 *srcp = (Uint16 *) info->s_pixels; Uint16 *srcp = (Uint16 *) info->src;
int srcskip = info->s_skip >> 1; int srcskip = info->s_skip >> 1;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int dstskip = info->d_skip >> 1; int dstskip = info->dst_pitch >> 1;
while (height--) { while (height--) {
if (((uintptr_t) srcp ^ (uintptr_t) dstp) & 2) { if (((uintptr_t) srcp ^ (uintptr_t) dstp) & 2) {
...@@ -1562,12 +1562,12 @@ Blit565to565SurfaceAlphaMMX(SDL_BlitInfo * info) ...@@ -1562,12 +1562,12 @@ Blit565to565SurfaceAlphaMMX(SDL_BlitInfo * info)
if (alpha == 128) { if (alpha == 128) {
Blit16to16SurfaceAlpha128(info, 0xf7de); Blit16to16SurfaceAlpha128(info, 0xf7de);
} else { } else {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint16 *srcp = (Uint16 *) info->s_pixels; Uint16 *srcp = (Uint16 *) info->src;
int srcskip = info->s_skip >> 1; int srcskip = info->s_skip >> 1;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int dstskip = info->d_skip >> 1; int dstskip = info->dst_pitch >> 1;
Uint32 s, d; Uint32 s, d;
__m64 src1, dst1, src2, dst2, gmask, bmask, mm_res, mm_alpha; __m64 src1, dst1, src2, dst2, gmask, bmask, mm_res, mm_alpha;
...@@ -1699,12 +1699,12 @@ Blit555to555SurfaceAlphaMMX(SDL_BlitInfo * info) ...@@ -1699,12 +1699,12 @@ Blit555to555SurfaceAlphaMMX(SDL_BlitInfo * info)
if (alpha == 128) { if (alpha == 128) {
Blit16to16SurfaceAlpha128(info, 0xfbde); Blit16to16SurfaceAlpha128(info, 0xfbde);
} else { } else {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint16 *srcp = (Uint16 *) info->s_pixels; Uint16 *srcp = (Uint16 *) info->src;
int srcskip = info->s_skip >> 1; int srcskip = info->s_skip >> 1;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int dstskip = info->d_skip >> 1; int dstskip = info->dst_pitch >> 1;
Uint32 s, d; Uint32 s, d;
__m64 src1, dst1, src2, dst2, rmask, gmask, bmask, mm_res, mm_alpha; __m64 src1, dst1, src2, dst2, rmask, gmask, bmask, mm_res, mm_alpha;
...@@ -1839,12 +1839,12 @@ Blit565to565SurfaceAlpha(SDL_BlitInfo * info) ...@@ -1839,12 +1839,12 @@ Blit565to565SurfaceAlpha(SDL_BlitInfo * info)
if (alpha == 128) { if (alpha == 128) {
Blit16to16SurfaceAlpha128(info, 0xf7de); Blit16to16SurfaceAlpha128(info, 0xf7de);
} else { } else {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint16 *srcp = (Uint16 *) info->s_pixels; Uint16 *srcp = (Uint16 *) info->src;
int srcskip = info->s_skip >> 1; int srcskip = info->s_skip >> 1;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int dstskip = info->d_skip >> 1; int dstskip = info->dst_pitch >> 1;
alpha >>= 3; /* downscale alpha to 5 bits */ alpha >>= 3; /* downscale alpha to 5 bits */
while (height--) { while (height--) {
...@@ -1878,12 +1878,12 @@ Blit555to555SurfaceAlpha(SDL_BlitInfo * info) ...@@ -1878,12 +1878,12 @@ Blit555to555SurfaceAlpha(SDL_BlitInfo * info)
if (alpha == 128) { if (alpha == 128) {
Blit16to16SurfaceAlpha128(info, 0xfbde); Blit16to16SurfaceAlpha128(info, 0xfbde);
} else { } else {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint16 *srcp = (Uint16 *) info->s_pixels; Uint16 *srcp = (Uint16 *) info->src;
int srcskip = info->s_skip >> 1; int srcskip = info->s_skip >> 1;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int dstskip = info->d_skip >> 1; int dstskip = info->dst_pitch >> 1;
alpha >>= 3; /* downscale alpha to 5 bits */ alpha >>= 3; /* downscale alpha to 5 bits */
while (height--) { while (height--) {
...@@ -1913,12 +1913,12 @@ Blit555to555SurfaceAlpha(SDL_BlitInfo * info) ...@@ -1913,12 +1913,12 @@ Blit555to555SurfaceAlpha(SDL_BlitInfo * info)
static void static void
BlitARGBto565PixelAlpha(SDL_BlitInfo * info) BlitARGBto565PixelAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int dstskip = info->d_skip >> 1; int dstskip = info->dst_pitch >> 1;
while (height--) { while (height--) {
/* *INDENT-OFF* */ /* *INDENT-OFF* */
...@@ -1959,12 +1959,12 @@ BlitARGBto565PixelAlpha(SDL_BlitInfo * info) ...@@ -1959,12 +1959,12 @@ BlitARGBto565PixelAlpha(SDL_BlitInfo * info)
static void static void
BlitARGBto555PixelAlpha(SDL_BlitInfo * info) BlitARGBto555PixelAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip >> 2; int srcskip = info->s_skip >> 2;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int dstskip = info->d_skip >> 1; int dstskip = info->dst_pitch >> 1;
while (height--) { while (height--) {
/* *INDENT-OFF* */ /* *INDENT-OFF* */
...@@ -2006,12 +2006,12 @@ BlitARGBto555PixelAlpha(SDL_BlitInfo * info) ...@@ -2006,12 +2006,12 @@ BlitARGBto555PixelAlpha(SDL_BlitInfo * info)
static void static void
BlitNtoNSurfaceAlpha(SDL_BlitInfo * info) BlitNtoNSurfaceAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
int srcbpp = srcfmt->BytesPerPixel; int srcbpp = srcfmt->BytesPerPixel;
...@@ -2050,12 +2050,12 @@ BlitNtoNSurfaceAlpha(SDL_BlitInfo * info) ...@@ -2050,12 +2050,12 @@ BlitNtoNSurfaceAlpha(SDL_BlitInfo * info)
static void static void
BlitNtoNSurfaceAlphaKey(SDL_BlitInfo * info) BlitNtoNSurfaceAlphaKey(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
...@@ -2096,12 +2096,12 @@ BlitNtoNSurfaceAlphaKey(SDL_BlitInfo * info) ...@@ -2096,12 +2096,12 @@ BlitNtoNSurfaceAlphaKey(SDL_BlitInfo * info)
static void static void
BlitNtoNPixelAlpha(SDL_BlitInfo * info) BlitNtoNPixelAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
......
src/video/SDL_blit_N.c
View file @ 422ec364
...@@ -158,11 +158,11 @@ static void Blit_RGB888_RGB565(SDL_BlitInfo * info); ...@@ -158,11 +158,11 @@ static void Blit_RGB888_RGB565(SDL_BlitInfo * info);
static void static void
Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info) Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info)
{ {
int height = info->d_height; int height = info->dst_h;
Uint8 *src = (Uint8 *) info->s_pixels; Uint8 *src = (Uint8 *) info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = (Uint8 *) info->d_pixels; Uint8 *dst = (Uint8 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
vector unsigned char valpha = vec_splat_u8(0); vector unsigned char valpha = vec_splat_u8(0);
vector unsigned char vpermute = calc_swizzle32(srcfmt, NULL); vector unsigned char vpermute = calc_swizzle32(srcfmt, NULL);
...@@ -186,7 +186,7 @@ Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info) ...@@ -186,7 +186,7 @@ Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info)
vector unsigned char voverflow; vector unsigned char voverflow;
vector unsigned char vsrc; vector unsigned char vsrc;
int width = info->d_width; int width = info->dst_w;
int extrawidth; int extrawidth;
/* do scalar until we can align... */ /* do scalar until we can align... */
...@@ -262,11 +262,11 @@ Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info) ...@@ -262,11 +262,11 @@ Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info)
static void static void
Blit_RGB565_32Altivec(SDL_BlitInfo * info) Blit_RGB565_32Altivec(SDL_BlitInfo * info)
{ {
int height = info->d_height; int height = info->dst_h;
Uint8 *src = (Uint8 *) info->s_pixels; Uint8 *src = (Uint8 *) info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = (Uint8 *) info->d_pixels; Uint8 *dst = (Uint8 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
unsigned alpha; unsigned alpha;
...@@ -336,7 +336,7 @@ Blit_RGB565_32Altivec(SDL_BlitInfo * info) ...@@ -336,7 +336,7 @@ Blit_RGB565_32Altivec(SDL_BlitInfo * info)
vector unsigned char voverflow; vector unsigned char voverflow;
vector unsigned char vsrc; vector unsigned char vsrc;
int width = info->d_width; int width = info->dst_w;
int extrawidth; int extrawidth;
/* do scalar until we can align... */ /* do scalar until we can align... */
...@@ -410,11 +410,11 @@ Blit_RGB565_32Altivec(SDL_BlitInfo * info) ...@@ -410,11 +410,11 @@ Blit_RGB565_32Altivec(SDL_BlitInfo * info)
static void static void
Blit_RGB555_32Altivec(SDL_BlitInfo * info) Blit_RGB555_32Altivec(SDL_BlitInfo * info)
{ {
int height = info->d_height; int height = info->dst_h;
Uint8 *src = (Uint8 *) info->s_pixels; Uint8 *src = (Uint8 *) info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = (Uint8 *) info->d_pixels; Uint8 *dst = (Uint8 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
unsigned alpha; unsigned alpha;
...@@ -484,7 +484,7 @@ Blit_RGB555_32Altivec(SDL_BlitInfo * info) ...@@ -484,7 +484,7 @@ Blit_RGB555_32Altivec(SDL_BlitInfo * info)
vector unsigned char voverflow; vector unsigned char voverflow;
vector unsigned char vsrc; vector unsigned char vsrc;
int width = info->d_width; int width = info->dst_w;
int extrawidth; int extrawidth;
/* do scalar until we can align... */ /* do scalar until we can align... */
...@@ -559,11 +559,11 @@ static void BlitNtoNKeyCopyAlpha(SDL_BlitInfo * info); ...@@ -559,11 +559,11 @@ static void BlitNtoNKeyCopyAlpha(SDL_BlitInfo * info);
static void static void
Blit32to32KeyAltivec(SDL_BlitInfo * info) Blit32to32KeyAltivec(SDL_BlitInfo * info)
{ {
int height = info->d_height; int height = info->dst_h;
Uint32 *srcp = (Uint32 *) info->s_pixels; Uint32 *srcp = (Uint32 *) info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint32 *dstp = (Uint32 *) info->d_pixels; Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
int srcbpp = srcfmt->BytesPerPixel; int srcbpp = srcfmt->BytesPerPixel;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
...@@ -578,7 +578,7 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info) ...@@ -578,7 +578,7 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info)
vector unsigned int vckey; vector unsigned int vckey;
vector unsigned int vrgbmask; vector unsigned int vrgbmask;
vpermute = calc_swizzle32(srcfmt, dstfmt); vpermute = calc_swizzle32(srcfmt, dstfmt);
if (info->d_width < 16) { if (info->dst_w < 16) {
if (copy_alpha) { if (copy_alpha) {
BlitNtoNKeyCopyAlpha(info); BlitNtoNKeyCopyAlpha(info);
} else { } else {
...@@ -631,7 +631,7 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info) ...@@ -631,7 +631,7 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info)
widthvar--; \ widthvar--; \
} \ } \
} }
int width = info->d_width; int width = info->dst_w;
ONE_PIXEL_BLEND((UNALIGNED_PTR(dstp)) && (width), width); ONE_PIXEL_BLEND((UNALIGNED_PTR(dstp)) && (width), width);
assert(width > 0); assert(width > 0);
if (width > 0) { if (width > 0) {
...@@ -677,11 +677,11 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info) ...@@ -677,11 +677,11 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info)
static void static void
ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info) ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info)
{ {
int height = info->d_height; int height = info->dst_h;
Uint32 *src = (Uint32 *) info->s_pixels; Uint32 *src = (Uint32 *) info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint32 *dst = (Uint32 *) info->d_pixels; Uint32 *dst = (Uint32 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
vector unsigned int vzero = vec_splat_u32(0); vector unsigned int vzero = vec_splat_u32(0);
...@@ -704,7 +704,7 @@ ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info) ...@@ -704,7 +704,7 @@ ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info)
Uint32 bits; Uint32 bits;
Uint8 r, g, b, a; Uint8 r, g, b, a;
int width = info->d_width; int width = info->dst_w;
int extrawidth; int extrawidth;
/* do scalar until we can align... */ /* do scalar until we can align... */
...@@ -756,11 +756,11 @@ ConvertAltivec32to32_prefetch(SDL_BlitInfo * info) ...@@ -756,11 +756,11 @@ ConvertAltivec32to32_prefetch(SDL_BlitInfo * info)
const int scalar_dst_lead = sizeof(Uint32) * 4; const int scalar_dst_lead = sizeof(Uint32) * 4;
const int vector_dst_lead = sizeof(Uint32) * 16; const int vector_dst_lead = sizeof(Uint32) * 16;
int height = info->d_height; int height = info->dst_h;
Uint32 *src = (Uint32 *) info->s_pixels; Uint32 *src = (Uint32 *) info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint32 *dst = (Uint32 *) info->d_pixels; Uint32 *dst = (Uint32 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
vector unsigned int vzero = vec_splat_u32(0); vector unsigned int vzero = vec_splat_u32(0);
...@@ -783,7 +783,7 @@ ConvertAltivec32to32_prefetch(SDL_BlitInfo * info) ...@@ -783,7 +783,7 @@ ConvertAltivec32to32_prefetch(SDL_BlitInfo * info)
Uint32 bits; Uint32 bits;
Uint8 r, g, b, a; Uint8 r, g, b, a;
int width = info->d_width; int width = info->dst_w;
int extrawidth; int extrawidth;
/* do scalar until we can align... */ /* do scalar until we can align... */
...@@ -898,12 +898,12 @@ Blit_RGB888_index8(SDL_BlitInfo * info) ...@@ -898,12 +898,12 @@ Blit_RGB888_index8(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = (Uint32 *) info->s_pixels; src = (Uint32 *) info->src;
srcskip = info->s_skip / 4; srcskip = info->s_skip / 4;
dst = info->d_pixels; dst = info->dst;
dstskip = info->d_skip; dstskip = info->dst_pitch;
map = info->table; map = info->table;
if (map == NULL) { if (map == NULL) {
...@@ -1015,12 +1015,12 @@ Blit_RGB888_RGB555(SDL_BlitInfo * info) ...@@ -1015,12 +1015,12 @@ Blit_RGB888_RGB555(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = (Uint32 *) info->s_pixels; src = (Uint32 *) info->src;
srcskip = info->s_skip / 4; srcskip = info->s_skip / 4;
dst = (Uint16 *) info->d_pixels; dst = (Uint16 *) info->dst;
dstskip = info->d_skip / 2; dstskip = info->dst_pitch / 2;
#ifdef USE_DUFFS_LOOP #ifdef USE_DUFFS_LOOP
while (height--) { while (height--) {
...@@ -1139,12 +1139,12 @@ Blit_RGB888_RGB565(SDL_BlitInfo * info) ...@@ -1139,12 +1139,12 @@ Blit_RGB888_RGB565(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = (Uint32 *) info->s_pixels; src = (Uint32 *) info->src;
srcskip = info->s_skip / 4; srcskip = info->s_skip / 4;
dst = (Uint16 *) info->d_pixels; dst = (Uint16 *) info->dst;
dstskip = info->d_skip / 2; dstskip = info->dst_pitch / 2;
#ifdef USE_DUFFS_LOOP #ifdef USE_DUFFS_LOOP
while (height--) { while (height--) {
...@@ -1252,12 +1252,12 @@ Blit_RGB565_32(SDL_BlitInfo * info, const Uint32 * map) ...@@ -1252,12 +1252,12 @@ Blit_RGB565_32(SDL_BlitInfo * info, const Uint32 * map)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = (Uint8 *) info->s_pixels; src = (Uint8 *) info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = (Uint32 *) info->d_pixels; dst = (Uint32 *) info->dst;
dstskip = info->d_skip / 4; dstskip = info->dst_pitch / 4;
#ifdef USE_DUFFS_LOOP #ifdef USE_DUFFS_LOOP
while (height--) { while (height--) {
...@@ -1874,12 +1874,12 @@ Blit_RGB888_index8_map(SDL_BlitInfo * info) ...@@ -1874,12 +1874,12 @@ Blit_RGB888_index8_map(SDL_BlitInfo * info)
int srcskip, dstskip; int srcskip, dstskip;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = (Uint32 *) info->s_pixels; src = (Uint32 *) info->src;
srcskip = info->s_skip / 4; srcskip = info->s_skip / 4;
dst = info->d_pixels; dst = info->dst;
dstskip = info->d_skip; dstskip = info->dst_pitch;
map = info->table; map = info->table;
#ifdef USE_DUFFS_LOOP #ifdef USE_DUFFS_LOOP
...@@ -1947,12 +1947,12 @@ BlitNto1(SDL_BlitInfo * info) ...@@ -1947,12 +1947,12 @@ BlitNto1(SDL_BlitInfo * info)
SDL_PixelFormat *srcfmt; SDL_PixelFormat *srcfmt;
/* Set up some basic variables */ /* Set up some basic variables */
width = info->d_width; width = info->dst_w;
height = info->d_height; height = info->dst_h;
src = info->s_pixels; src = info->src;
srcskip = info->s_skip; srcskip = info->s_skip;
dst = info->d_pixels; dst = info->dst;
dstskip = info->d_skip; dstskip = info->dst_pitch;
map = info->table; map = info->table;
srcfmt = info->src; srcfmt = info->src;
srcbpp = srcfmt->BytesPerPixel; srcbpp = srcfmt->BytesPerPixel;
...@@ -2028,12 +2028,12 @@ BlitNto1(SDL_BlitInfo * info) ...@@ -2028,12 +2028,12 @@ BlitNto1(SDL_BlitInfo * info)
static void static void
Blit4to4MaskAlpha(SDL_BlitInfo * info) Blit4to4MaskAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint32 *src = (Uint32 *) info->s_pixels; Uint32 *src = (Uint32 *) info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint32 *dst = (Uint32 *) info->d_pixels; Uint32 *dst = (Uint32 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
...@@ -2077,12 +2077,12 @@ Blit4to4MaskAlpha(SDL_BlitInfo * info) ...@@ -2077,12 +2077,12 @@ Blit4to4MaskAlpha(SDL_BlitInfo * info)
static void static void
BlitNtoN(SDL_BlitInfo * info) BlitNtoN(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
int srcbpp = srcfmt->BytesPerPixel; int srcbpp = srcfmt->BytesPerPixel;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
...@@ -2112,12 +2112,12 @@ BlitNtoN(SDL_BlitInfo * info) ...@@ -2112,12 +2112,12 @@ BlitNtoN(SDL_BlitInfo * info)
static void static void
BlitNtoNCopyAlpha(SDL_BlitInfo * info) BlitNtoNCopyAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
int srcbpp = srcfmt->BytesPerPixel; int srcbpp = srcfmt->BytesPerPixel;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
...@@ -2142,12 +2142,12 @@ BlitNtoNCopyAlpha(SDL_BlitInfo * info) ...@@ -2142,12 +2142,12 @@ BlitNtoNCopyAlpha(SDL_BlitInfo * info)
static void static void
BlitNto1Key(SDL_BlitInfo * info) BlitNto1Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
const Uint8 *palmap = info->table; const Uint8 *palmap = info->table;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
...@@ -2208,12 +2208,12 @@ BlitNto1Key(SDL_BlitInfo * info) ...@@ -2208,12 +2208,12 @@ BlitNto1Key(SDL_BlitInfo * info)
static void static void
Blit2to2Key(SDL_BlitInfo * info) Blit2to2Key(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint16 *srcp = (Uint16 *) info->s_pixels; Uint16 *srcp = (Uint16 *) info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint16 *dstp = (Uint16 *) info->d_pixels; Uint16 *dstp = (Uint16 *) info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
Uint32 rgbmask = ~info->src->Amask; Uint32 rgbmask = ~info->src->Amask;
...@@ -2242,12 +2242,12 @@ Blit2to2Key(SDL_BlitInfo * info) ...@@ -2242,12 +2242,12 @@ Blit2to2Key(SDL_BlitInfo * info)
static void static void
BlitNtoNKey(SDL_BlitInfo * info) BlitNtoNKey(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
...@@ -2285,12 +2285,12 @@ BlitNtoNKey(SDL_BlitInfo * info) ...@@ -2285,12 +2285,12 @@ BlitNtoNKey(SDL_BlitInfo * info)
static void static void
BlitNtoNKeyCopyAlpha(SDL_BlitInfo * info) BlitNtoNKeyCopyAlpha(SDL_BlitInfo * info)
{ {
int width = info->d_width; int width = info->dst_w;
int height = info->d_height; int height = info->dst_h;
Uint8 *src = info->s_pixels; Uint8 *src = info->src;
int srcskip = info->s_skip; int srcskip = info->s_skip;
Uint8 *dst = info->d_pixels; Uint8 *dst = info->dst;
int dstskip = info->d_skip; int dstskip = info->dst_pitch;
Uint32 ckey = info->ckey; Uint32 ckey = info->ckey;
SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *srcfmt = info->src;
SDL_PixelFormat *dstfmt = info->dst; SDL_PixelFormat *dstfmt = info->dst;
......
src/video/SDL_rendercopy.c → src/video/SDL_blit_auto.c
View file @ 422ec364
This source diff could not be displayed because it is too large. You can view the blob instead.
src/video/SDL_blit_auto.h 0 → 100644
View file @ 422ec364
/* DO NOT EDIT! This file is generated by sdlgenblit.pl */
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997-2006 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Sam Lantinga
slouken@libsdl.org
*/
#include "SDL_config.h"
/* *INDENT-OFF* */
extern SDL_BlitFuncEntry *SDL_GeneratedBlitFuncTable;
/* *INDENT-ON* */
/* vi: set ts=4 sw=4 expandtab: */
src/video/SDL_blit_copy.c
View file @ 422ec364
...@@ -95,12 +95,12 @@ SDL_BlitCopy(SDL_BlitInfo * info) ...@@ -95,12 +95,12 @@ SDL_BlitCopy(SDL_BlitInfo * info)
int w, h; int w, h;
int srcskip, dstskip; int srcskip, dstskip;
w = info->d_width * info->dst->BytesPerPixel; w = info->dst_w * info->dst->BytesPerPixel;
h = info->d_height; h = info->dst_h;
src = info->s_pixels; src = info->src;
dst = info->d_pixels; dst = info->dst;
srcskip = w + info->s_skip; srcskip = w + info->s_skip;
dstskip = w + info->d_skip; dstskip = w + info->dst_pitch;
#ifdef __SSE__ #ifdef __SSE__
if (SDL_HasSSE() && !((uintptr_t) src & 15) && !((uintptr_t) dst & 15)) { if (SDL_HasSSE() && !((uintptr_t) src & 15) && !((uintptr_t) dst & 15)) {
...@@ -139,10 +139,10 @@ SDL_BlitCopyOverlap(SDL_BlitInfo * info) ...@@ -139,10 +139,10 @@ SDL_BlitCopyOverlap(SDL_BlitInfo * info)
int w, h; int w, h;
int skip; int skip;
w = info->d_width * info->dst->BytesPerPixel; w = info->dst_w * info->dst->BytesPerPixel;
h = info->d_height; h = info->dst_h;
src = info->s_pixels; src = info->src;
dst = info->d_pixels; dst = info->dst;
skip = w + info->s_skip; skip = w + info->s_skip;
if ((dst < src) || (dst >= (src + h * skip))) { if ((dst < src) || (dst >= (src + h * skip))) {
SDL_BlitCopy(info); SDL_BlitCopy(info);
......
src/video/SDL_rendercopy.h deleted 100644 → 0
View file @ 3f37bb54
/* DO NOT EDIT! This file is generated by sdlgenblit.pl */
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997-2006 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Sam Lantinga
slouken@libsdl.org
*/
#include "SDL_config.h"
/* *INDENT-OFF* */
#define SDL_RENDERCOPY_MODULATE_COLOR 0x0001
#define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002
#define SDL_RENDERCOPY_MASK 0x0010
#define SDL_RENDERCOPY_BLEND 0x0020
#define SDL_RENDERCOPY_ADD 0x0040
#define SDL_RENDERCOPY_MOD 0x0080
#define SDL_RENDERCOPY_NEAREST 0x0100
typedef struct {
Uint8 *src;
int src_w, src_h;
int src_pitch;
Uint8 *dst;
int dst_w, dst_h;
int dst_pitch;
void *aux_data;
int flags;
Uint8 r, g, b, a;
} SDL_RenderCopyData;
typedef int (SDLCALL * SDL_RenderCopyFunc)(SDL_RenderCopyData *data);
extern SDL_RenderCopyFunc SDLCALL SDL_GetRenderCopyFunc(Uint32 src_format, Uint32 dst_format, int modMode, int blendMode, int scaleMode);
extern int SDLCALL SDL_RenderCopy_RGB888_RGB888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_RGB888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_RGB888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_RGB888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_RGB888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_RGB888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_BGR888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_BGR888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_BGR888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_BGR888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_BGR888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_BGR888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGB888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_RGB888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_RGB888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_RGB888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_RGB888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_RGB888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_RGB888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_BGR888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_BGR888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_BGR888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_BGR888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_BGR888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_BGR888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGR888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_RGB888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_RGB888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_RGB888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_RGB888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_BGR888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_BGR888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_BGR888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_BGR888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_RGB888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_RGB888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_RGB888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_BGR888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_BGR888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_BGR888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_RGB888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_RGB888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_RGB888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_RGB888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_BGR888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_BGR888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_BGR888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_BGR888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_RGB888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_RGB888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_RGB888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_BGR888_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_BGR888_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_BGR888_Modulate(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data);
extern int SDLCALL SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data);
/* *INDENT-ON* */
/* vi: set ts=4 sw=4 expandtab: */
src/video/SDL_renderer_sw.c
View file @ 422ec364
...@@ -667,7 +667,8 @@ SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -667,7 +667,8 @@ SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
if (texture->scaleMode) { if (texture->scaleMode) {
copydata.flags |= SDL_RENDERCOPY_NEAREST; copydata.flags |= SDL_RENDERCOPY_NEAREST;
} }
status = copyfunc(&copydata); copyfunc(&copydata);
status = 0;
} else { } else {
SDL_Rect real_srcrect = *srcrect; SDL_Rect real_srcrect = *srcrect;
SDL_Rect real_dstrect; SDL_Rect real_dstrect;
......
src/video/dummy/SDL_nullrender.c
View file @ 422ec364
...@@ -200,7 +200,8 @@ SDL_DUMMY_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -200,7 +200,8 @@ SDL_DUMMY_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
if (texture->scaleMode) { if (texture->scaleMode) {
copydata.flags |= SDL_RENDERCOPY_NEAREST; copydata.flags |= SDL_RENDERCOPY_NEAREST;
} }
return copyfunc(&copydata); copyfunc(&copydata);
return 0;
} else { } else {
SDL_Rect real_srcrect = *srcrect; SDL_Rect real_srcrect = *srcrect;
SDL_Rect real_dstrect = *dstrect; SDL_Rect real_dstrect = *dstrect;
......
src/video/sdlgenblit.pl
View file @ 422ec364
...@@ -123,30 +123,7 @@ __EOF__ ...@@ -123,30 +123,7 @@ __EOF__
sub output_copydefs sub output_copydefs
{ {
print FILE <<__EOF__; print FILE <<__EOF__;
#define SDL_RENDERCOPY_MODULATE_COLOR 0x0001 extern SDL_BlitFuncEntry *SDL_GeneratedBlitFuncTable;
#define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002
#define SDL_RENDERCOPY_MASK 0x0010
#define SDL_RENDERCOPY_BLEND 0x0020
#define SDL_RENDERCOPY_ADD 0x0040
#define SDL_RENDERCOPY_MOD 0x0080
#define SDL_RENDERCOPY_NEAREST 0x0100
typedef struct {
void *src;
int src_w, src_h;
int src_pitch;
void *dst;
int dst_w, dst_h;
int dst_pitch;
void *aux_data;
int flags;
Uint8 r, g, b, a;
} SDL_RenderCopyData;
typedef int (*SDL_RenderCopyFunc)(SDL_RenderCopyData *data);
extern SDL_RenderCopyFunc SDLCALL SDL_GetRenderCopyFunc(Uint32 src_format, Uint32 dst_format, int modMode, int blendMode, int scaleMode);
__EOF__ __EOF__
} }
...@@ -161,7 +138,7 @@ sub output_copyfuncname ...@@ -161,7 +138,7 @@ sub output_copyfuncname
my $args = shift; my $args = shift;
my $suffix = shift; my $suffix = shift;
print FILE "$prefix SDL_RenderCopy_${src}_${dst}"; print FILE "$prefix SDL_Blit_${src}_${dst}";
if ( $modulate ) { if ( $modulate ) {
print FILE "_Modulate"; print FILE "_Modulate";
} }
...@@ -172,7 +149,7 @@ sub output_copyfuncname ...@@ -172,7 +149,7 @@ sub output_copyfuncname
print FILE "_Scale"; print FILE "_Scale";
} }
if ( $args ) { if ( $args ) {
print FILE "(SDL_RenderCopyData *data)"; print FILE "(SDL_BlitInfo *info)";
} }
print FILE "$suffix"; print FILE "$suffix";
} }
...@@ -225,7 +202,7 @@ sub output_copycore ...@@ -225,7 +202,7 @@ sub output_copycore
__EOF__ __EOF__
return; return;
} }
if ( $blend ) { if ( $blend ) {
get_rgba("src", $src); get_rgba("src", $src);
get_rgba("dst", $dst); get_rgba("dst", $dst);
...@@ -237,19 +214,19 @@ __EOF__ ...@@ -237,19 +214,19 @@ __EOF__
if ( $modulate ) { if ( $modulate ) {
print FILE <<__EOF__; print FILE <<__EOF__;
if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { if (flags & SDL_COPY_MODULATE_COLOR) {
${s}R = (${s}R * modulateR) / 255; ${s}R = (${s}R * modulateR) / 255;
${s}G = (${s}G * modulateG) / 255; ${s}G = (${s}G * modulateG) / 255;
${s}B = (${s}B * modulateB) / 255; ${s}B = (${s}B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { if (flags & SDL_COPY_MODULATE_ALPHA) {
${s}A = (${s}A * modulateA) / 255; ${s}A = (${s}A * modulateA) / 255;
} }
__EOF__ __EOF__
} }
if ( $blend ) { if ( $blend ) {
print FILE <<__EOF__; print FILE <<__EOF__;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
if (${s}A < 255) { if (${s}A < 255) {
${s}R = (${s}R * ${s}A) / 255; ${s}R = (${s}R * ${s}A) / 255;
...@@ -257,25 +234,25 @@ __EOF__ ...@@ -257,25 +234,25 @@ __EOF__
${s}B = (${s}B * ${s}A) / 255; ${s}B = (${s}B * ${s}A) / 255;
} }
} }
switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
case SDL_RENDERCOPY_MASK: case SDL_COPY_MASK:
if (${s}A) { if (${s}A) {
${d}R = ${s}R; ${d}R = ${s}R;
${d}G = ${s}G; ${d}G = ${s}G;
${d}B = ${s}B; ${d}B = ${s}B;
} }
break; break;
case SDL_RENDERCOPY_BLEND: case SDL_COPY_BLEND:
${d}R = ${s}R + ((255 - ${s}A) * ${d}R) / 255; ${d}R = ${s}R + ((255 - ${s}A) * ${d}R) / 255;
${d}G = ${s}G + ((255 - ${s}A) * ${d}G) / 255; ${d}G = ${s}G + ((255 - ${s}A) * ${d}G) / 255;
${d}B = ${s}B + ((255 - ${s}A) * ${d}B) / 255; ${d}B = ${s}B + ((255 - ${s}A) * ${d}B) / 255;
break; break;
case SDL_RENDERCOPY_ADD: case SDL_COPY_ADD:
${d}R = ${s}R + ${d}R; if (${d}R > 255) ${d}R = 255; ${d}R = ${s}R + ${d}R; if (${d}R > 255) ${d}R = 255;
${d}G = ${s}G + ${d}G; if (${d}G > 255) ${d}G = 255; ${d}G = ${s}G + ${d}G; if (${d}G > 255) ${d}G = 255;
${d}B = ${s}B + ${d}B; if (${d}B > 255) ${d}B = 255; ${d}B = ${s}B + ${d}B; if (${d}B > 255) ${d}B = 255;
break; break;
case SDL_RENDERCOPY_MOD: case SDL_COPY_MOD:
${d}R = (${s}R * ${d}R) / 255; ${d}R = (${s}R * ${d}R) / 255;
${d}G = (${s}G * ${d}G) / 255; ${d}G = (${s}G * ${d}G) / 255;
${d}B = (${s}B * ${d}B) / 255; ${d}B = (${s}B * ${d}B) / 255;
...@@ -298,17 +275,17 @@ sub output_copyfunc ...@@ -298,17 +275,17 @@ sub output_copyfunc
my $blend = shift; my $blend = shift;
my $scale = shift; my $scale = shift;
output_copyfuncname("int", $src, $dst, $modulate, $blend, $scale, 1, "\n"); output_copyfuncname("void", $src, $dst, $modulate, $blend, $scale, 1, "\n");
print FILE <<__EOF__; print FILE <<__EOF__;
{ {
const int flags = data->flags; const int flags = info->flags;
__EOF__ __EOF__
if ( $modulate ) { if ( $modulate ) {
print FILE <<__EOF__; print FILE <<__EOF__;
const Uint32 modulateR = data->r; const Uint32 modulateR = info->r;
const Uint32 modulateG = data->g; const Uint32 modulateG = info->g;
const Uint32 modulateB = data->b; const Uint32 modulateB = info->b;
const Uint32 modulateA = data->a; const Uint32 modulateA = info->a;
__EOF__ __EOF__
} }
if ( $blend ) { if ( $blend ) {
...@@ -332,13 +309,13 @@ __EOF__ ...@@ -332,13 +309,13 @@ __EOF__
srcy = 0; srcy = 0;
posy = 0; posy = 0;
incy = (data->src_h << 16) / data->dst_h; incy = (info->src_h << 16) / info->dst_h;
incx = (data->src_w << 16) / data->dst_w; incx = (info->src_w << 16) / info->dst_w;
while (data->dst_h--) { while (info->dst_h--) {
$format_type{$src} *src; $format_type{$src} *src;
$format_type{$dst} *dst = ($format_type{$dst} *)data->dst; $format_type{$dst} *dst = ($format_type{$dst} *)info->dst;
int n = data->dst_w; int n = info->dst_w;
srcx = -1; srcx = -1;
posx = 0x10000L; posx = 0x10000L;
while (posy >= 0x10000L) { while (posy >= 0x10000L) {
...@@ -351,7 +328,7 @@ __EOF__ ...@@ -351,7 +328,7 @@ __EOF__
++srcx; ++srcx;
posx -= 0x10000L; posx -= 0x10000L;
} }
src = ($format_type{$src} *)(data->src + (srcy * data->src_pitch) + (srcx * $format_size{$src})); src = ($format_type{$src} *)(info->src + (srcy * info->src_pitch) + (srcx * $format_size{$src}));
__EOF__ __EOF__
print FILE <<__EOF__; print FILE <<__EOF__;
} }
...@@ -362,16 +339,16 @@ __EOF__ ...@@ -362,16 +339,16 @@ __EOF__
++dst; ++dst;
} }
posy += incy; posy += incy;
data->dst += data->dst_pitch; info->dst += info->dst_pitch;
} }
__EOF__ __EOF__
} else { } else {
print FILE <<__EOF__; print FILE <<__EOF__;
while (data->dst_h--) { while (info->dst_h--) {
$format_type{$src} *src = ($format_type{$src} *)data->src; $format_type{$src} *src = ($format_type{$src} *)info->src;
$format_type{$dst} *dst = ($format_type{$dst} *)data->dst; $format_type{$dst} *dst = ($format_type{$dst} *)info->dst;
int n = data->dst_w; int n = info->dst_w;
while (n--) { while (n--) {
__EOF__ __EOF__
output_copycore($src, $dst, $modulate, $blend); output_copycore($src, $dst, $modulate, $blend);
...@@ -379,13 +356,12 @@ __EOF__ ...@@ -379,13 +356,12 @@ __EOF__
++src; ++src;
++dst; ++dst;
} }
data->src += data->src_pitch; info->src += info->src_pitch;
data->dst += data->dst_pitch; info->dst += info->dst_pitch;
} }
__EOF__ __EOF__
} }
print FILE <<__EOF__; print FILE <<__EOF__;
return 0;
} }
__EOF__ __EOF__
...@@ -393,24 +369,14 @@ __EOF__ ...@@ -393,24 +369,14 @@ __EOF__
sub output_copyfunc_h sub output_copyfunc_h
{ {
my $src = shift;
my $dst = shift;
for (my $modulate = 0; $modulate <= 1; ++$modulate) {
for (my $blend = 0; $blend <= 1; ++$blend) {
for (my $scale = 0; $scale <= 1; ++$scale) {
if ( $modulate || $blend || $scale ) {
output_copyfuncname("extern int SDLCALL", $src, $dst, $modulate, $blend, $scale, 1, ";\n");
}
}
}
}
} }
sub output_copyinc sub output_copyinc
{ {
print FILE <<__EOF__; print FILE <<__EOF__;
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_rendercopy.h" #include "SDL_blit.h"
#include "SDL_blit_auto.h"
__EOF__ __EOF__
} }
...@@ -418,14 +384,7 @@ __EOF__ ...@@ -418,14 +384,7 @@ __EOF__
sub output_copyfunctable sub output_copyfunctable
{ {
print FILE <<__EOF__; print FILE <<__EOF__;
static struct { static SDL_BlitFuncEntry _SDL_GeneratedBlitFuncTable[] = {
Uint32 src_format;
Uint32 dst_format;
int modMode;
int blendMode;
int scaleMode;
SDL_RenderCopyFunc func;
} SDL_RenderCopyFuncTable[] = {
__EOF__ __EOF__
for (my $i = 0; $i <= $#src_formats; ++$i) { for (my $i = 0; $i <= $#src_formats; ++$i) {
my $src = $src_formats[$i]; my $src = $src_formats[$i];
...@@ -436,21 +395,36 @@ __EOF__ ...@@ -436,21 +395,36 @@ __EOF__
for (my $scale = 0; $scale <= 1; ++$scale) { for (my $scale = 0; $scale <= 1; ++$scale) {
if ( $modulate || $blend || $scale ) { if ( $modulate || $blend || $scale ) {
print FILE " { SDL_PIXELFORMAT_$src, SDL_PIXELFORMAT_$dst, "; print FILE " { SDL_PIXELFORMAT_$src, SDL_PIXELFORMAT_$dst, ";
my $flags = "";
my $flag = "";
if ( $modulate ) { if ( $modulate ) {
print FILE "(SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), "; $flag = "SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA";
} else { if ( $flags eq "" ) {
print FILE "0, "; $flags = $flag;
} else {
$flags = "$flags | $flag";
}
} }
if ( $blend ) { if ( $blend ) {
print FILE "(SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), "; $flag = "SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD";
} else { if ( $flags eq "" ) {
print FILE "0, "; $flags = $flag;
} else {
$flags = "$flags | $flag";
}
} }
if ( $scale ) { if ( $scale ) {
print FILE "SDL_TEXTURESCALEMODE_FAST, "; $flag = "SDL_COPY_NEAREST";
} else { if ( $flags eq "" ) {
print FILE "0, "; $flags = $flag;
} else {
$flags = "$flags | $flag";
}
}
if ( $flags eq "" ) {
$flags = "0";
} }
print FILE "($flags), SDL_CPU_ANY,";
output_copyfuncname("", $src_formats[$i], $dst_formats[$j], $modulate, $blend, $scale, 0, " },\n"); output_copyfuncname("", $src_formats[$i], $dst_formats[$j], $modulate, $blend, $scale, 0, " },\n");
} }
} }
...@@ -459,32 +433,10 @@ __EOF__ ...@@ -459,32 +433,10 @@ __EOF__
} }
} }
print FILE <<__EOF__; print FILE <<__EOF__;
{ 0, 0, 0, 0, NULL }
}; };
SDL_RenderCopyFunc SDL_GetRenderCopyFunc(Uint32 src_format, Uint32 dst_format, int modMode, int blendMode, int scaleMode) SDL_BlitFuncEntry *SDL_GeneratedBlitFuncTable = _SDL_GeneratedBlitFuncTable;
{
int i;
for (i = 0; i < SDL_arraysize(SDL_RenderCopyFuncTable); ++i) {
if (src_format != SDL_RenderCopyFuncTable[i].src_format) {
continue;
}
if (dst_format != SDL_RenderCopyFuncTable[i].dst_format) {
continue;
}
if ((modMode & SDL_RenderCopyFuncTable[i].modMode) != modMode) {
continue;
}
if ((blendMode & SDL_RenderCopyFuncTable[i].blendMode) != blendMode) {
continue;
}
if ((scaleMode & SDL_RenderCopyFuncTable[i].scaleMode) != scaleMode) {
continue;
}
return SDL_RenderCopyFuncTable[i].func;
}
return NULL;
}
__EOF__ __EOF__
} }
...@@ -505,7 +457,7 @@ sub output_copyfunc_c ...@@ -505,7 +457,7 @@ sub output_copyfunc_c
} }
} }
open_file("SDL_rendercopy.h"); open_file("SDL_blit_auto.h");
output_copydefs(); output_copydefs();
for (my $i = 0; $i <= $#src_formats; ++$i) { for (my $i = 0; $i <= $#src_formats; ++$i) {
for (my $j = 0; $j <= $#dst_formats; ++$j) { for (my $j = 0; $j <= $#dst_formats; ++$j) {
...@@ -513,9 +465,9 @@ for (my $i = 0; $i <= $#src_formats; ++$i) { ...@@ -513,9 +465,9 @@ for (my $i = 0; $i <= $#src_formats; ++$i) {
} }
} }
print FILE "\n"; print FILE "\n";
close_file("SDL_rendercopy.h"); close_file("SDL_blit_auto.h");
open_file("SDL_rendercopy.c"); open_file("SDL_blit_auto.c");
output_copyinc(); output_copyinc();
output_copyfunctable(); output_copyfunctable();
for (my $i = 0; $i <= $#src_formats; ++$i) { for (my $i = 0; $i <= $#src_formats; ++$i) {
...@@ -523,4 +475,4 @@ for (my $i = 0; $i <= $#src_formats; ++$i) { ...@@ -523,4 +475,4 @@ for (my $i = 0; $i <= $#src_formats; ++$i) {
output_copyfunc_c($src_formats[$i], $dst_formats[$j]); output_copyfunc_c($src_formats[$i], $dst_formats[$j]);
} }
} }
close_file("SDL_rendercopy.c"); close_file("SDL_blit_auto.c");
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