From ac8654a27fae43838e8718ffc9d583e406ab26d4 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 17 Aug 2007 06:21:58 +0000 Subject: [PATCH] Work in progress: merging new texture features into SDL blit system --- src/video/SDL_RLEaccel.c | 6 +- src/video/SDL_blit.c | 77 +- src/video/SDL_blit.h | 81 +- src/video/SDL_blit_0.c | 100 +- src/video/SDL_blit_1.c | 100 +- src/video/SDL_blit_A.c | 264 +- src/video/SDL_blit_N.c | 192 +- .../{SDL_rendercopy.c => SDL_blit_auto.c} | 2884 ++++++++--------- src/video/SDL_blit_auto.h | 31 + src/video/SDL_blit_copy.c | 18 +- src/video/SDL_rendercopy.h | 138 - src/video/SDL_renderer_sw.c | 3 +- src/video/dummy/SDL_nullrender.c | 3 +- src/video/sdlgenblit.pl | 176 +- 14 files changed, 1914 insertions(+), 2159 deletions(-) rename src/video/{SDL_rendercopy.c => SDL_blit_auto.c} (60%) create mode 100644 src/video/SDL_blit_auto.h delete mode 100644 src/video/SDL_rendercopy.h diff --git a/src/video/SDL_RLEaccel.c b/src/video/SDL_RLEaccel.c index 08bc092b3..68a229b7f 100644 --- a/src/video/SDL_RLEaccel.c +++ b/src/video/SDL_RLEaccel.c @@ -906,7 +906,7 @@ SDL_RLEBlit(SDL_Surface * src, SDL_Rect * srcrect, } 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 (srcrect->x || srcrect->w != src->w) { RLEClipBlit(w, srcbuf, dst, dstbuf, srcrect, alpha); @@ -1715,7 +1715,7 @@ RLEColorkeySurface(SDL_Surface * surface) skip = run = 0; dst = rlebuf; rgbmask = ~surface->format->Amask; - ckey = surface->map->ckey & rgbmask; + ckey = surface->map->info.colorkey & rgbmask; lastline = dst; getpix = getpixes[bpp - 1]; w = surface->w; @@ -1948,7 +1948,7 @@ SDL_UnRLESurface(SDL_Surface * surface, int recode) } /* 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 */ full.x = full.y = 0; diff --git a/src/video/SDL_blit.c b/src/video/SDL_blit.c index b0c79ec14..bf89c5ada 100644 --- a/src/video/SDL_blit.c +++ b/src/video/SDL_blit.c @@ -61,31 +61,23 @@ SDL_SoftBlit(SDL_Surface * src, SDL_Rect * srcrect, /* Set up source and destination buffer pointers, and BLIT! */ if (okay && srcrect->w && srcrect->h) { - SDL_BlitInfo info; - SDL_loblit RunBlit; + SDL_BlitInfo *info = &src->map->info; /* Set up the blit information */ - info.s_pixels = (Uint8 *) src->pixels + + info->src = (Uint8 *) src->pixels + (Uint16) srcrect->y * src->pitch + - (Uint16) srcrect->x * src->format->BytesPerPixel; - info.s_width = srcrect->w; - info.s_height = srcrect->h; - info.s_skip = src->pitch - info.s_width * src->format->BytesPerPixel; - info.d_pixels = (Uint8 *) dst->pixels + + (Uint16) srcrect->x * info->src_fmt->BytesPerPixel; + info.src_w = srcrect->w; + info.src_h = srcrect->h; + info.dst = (Uint8 *) dst->pixels + (Uint16) dstrect->y * dst->pitch + - (Uint16) dstrect->x * dst->format->BytesPerPixel; - info.d_width = dstrect->w; - info.d_height = dstrect->h; - info.d_skip = dst->pitch - info.d_width * dst->format->BytesPerPixel; - 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; + (Uint16) dstrect->x * info->dst_fmt->BytesPerPixel; + info.dst_w = dstrect->w; + info.dst_h = dstrect->h; + RunBlit = (SDL_BlitFunc) src->map->data; /* Run the actual software blit */ - RunBlit(&info); + RunBlit(info); } /* We need to unlock the surfaces if they're locked */ @@ -124,50 +116,67 @@ SDL_UseAltivecPrefetch() } #endif /* __MACOSX__ */ -static SDL_loblit -SDL_ChooseBlitFunc(SDL_BlitEntry * entries, int count) +static SDL_BlitFunc +SDL_ChooseBlitFunc(Uint32 src_format, Uint32 dst_format, int flags, SDL_BlitEntry * entries) { int i; static Uint32 features = 0xffffffff; + /* Get the available CPU features */ 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 .. */ if (override) { SDL_sscanf(override, "%u", &features); } else { if (SDL_HasMMX()) { - features |= SDL_BLIT_MMX; + features |= SDL_CPU_MMX; + } + if (SDL_Has3DNow()) { + features |= SDL_CPU_3DNOW; } if (SDL_HasSSE()) { - features |= SDL_BLIT_SSE; + features |= SDL_CPU_SSE; + } + if (SDL_HasSSE2()) { + features |= SDL_CPU_SSE2; } if (SDL_HasAltiVec()) { if (SDL_UseAltivecPrefetch()) { - features |= SDL_BLIT_ALTIVEC_PREFETCH; + features |= SDL_CPU_ALTIVEC_PREFETCH; } else { - features |= SDL_BLIT_ALTIVEC_NOPREFETCH; + features |= SDL_CPU_ALTIVEC_NOPREFETCH; } } } } - for (i = count; i > 0; --i) { - if (features & entries[i].features) { - return entries[i].blit; + for (i = 0; entries[i].blit; ++i) { + if (src_format != entries[i].src_format) { + 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 */ int SDL_CalculateBlit(SDL_Surface * surface) { - SDL_loblit blit = NULL; + SDL_BlitFunc blit = NULL; int blit_index; /* Clean everything out to start */ @@ -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 */ if (blit == NULL) { SDL_InvalidateMap(surface->map); diff --git a/src/video/SDL_blit.h b/src/video/SDL_blit.h index 30769471b..d43f68299 100644 --- a/src/video/SDL_blit.h +++ b/src/video/SDL_blit.h @@ -33,67 +33,74 @@ #ifdef __SSE__ #include #endif +#ifdef __SSE2__ +#include +#endif #include "SDL_cpuinfo.h" #include "SDL_endian.h" -/* The structure passed to the low level blit functions */ -typedef struct -{ - Uint8 *s_pixels; - int s_width; - int s_height; - int s_skip; - Uint8 *d_pixels; - int d_width; - int d_height; - int d_skip; - SDL_PixelFormat *src; +/* SDL blit copy flags */ +#define SDL_COPY_MODULATE_COLOR 0x0001 +#define SDL_COPY_MODULATE_ALPHA 0x0002 +#define SDL_COPY_MASK 0x0010 +#define SDL_COPY_BLEND 0x0020 +#define SDL_COPY_ADD 0x0040 +#define SDL_COPY_MOD 0x0080 +#define SDL_COPY_COLORKEY 0x0100 +#define SDL_COPY_NEAREST 0x0200 + +/* SDL blit CPU flags */ +#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; - SDL_PixelFormat *dst; - Uint32 ckey, cmod; + int flags; + Uint32 colorkey; + Uint8 r, g, b, a; } SDL_BlitInfo; -/* The type definition for the low level blit functions */ -typedef void (*SDL_loblit) (SDL_BlitInfo * info); +typedef void (SDLCALL * SDL_BlitFunc)(SDL_BlitInfo *info); + +typedef struct { + Uint32 src_format; + Uint32 dst_format; + int flags; + int cpu; + SDL_BlitFunc func; +} SDL_BlitFuncEntry; /* Blit mapping definition */ typedef struct SDL_BlitMap { SDL_Surface *dst; int identity; - Uint8 *table; SDL_blit blit; void *data; - Uint32 ckey; /* colorkey */ - Uint32 cmod; /* ARGB modulation */ + SDL_BlitInfo info; /* the version count matches the destination; mismatch indicates an invalid mapping */ unsigned int format_version; } 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 */ 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 */ diff --git a/src/video/SDL_blit_0.c b/src/video/SDL_blit_0.c index 9d55290d0..c3f099e41 100644 --- a/src/video/SDL_blit_0.c +++ b/src/video/SDL_blit_0.c @@ -35,12 +35,12 @@ BlitBto1(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = info->src; srcskip = info->s_skip; - dst = info->d_pixels; - dstskip = info->d_skip; + dst = info->dst; + dstskip = info->dst_pitch; map = info->table; srcskip += width - (width + 7) / 8; @@ -90,12 +90,12 @@ BlitBto2(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = info->src; srcskip = info->s_skip; - dst = (Uint16 *) info->d_pixels; - dstskip = info->d_skip / 2; + dst = (Uint16 *) info->dst; + dstskip = info->dst_pitch / 2; map = (Uint16 *) info->table; srcskip += width - (width + 7) / 8; @@ -125,12 +125,12 @@ BlitBto3(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = info->src; srcskip = info->s_skip; - dst = info->d_pixels; - dstskip = info->d_skip; + dst = info->dst; + dstskip = info->dst_pitch; map = info->table; srcskip += width - (width + 7) / 8; @@ -164,12 +164,12 @@ BlitBto4(SDL_BlitInfo * info) int c; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = info->src; srcskip = info->s_skip; - dst = (Uint32 *) info->d_pixels; - dstskip = info->d_skip / 4; + dst = (Uint32 *) info->dst; + dstskip = info->dst_pitch / 4; map = (Uint32 *) info->table; srcskip += width - (width + 7) / 8; @@ -194,12 +194,12 @@ BlitBto4(SDL_BlitInfo * info) static void BlitBto1Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; - Uint8 *dst = info->d_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; + Uint8 *dst = info->dst; int srcskip = info->s_skip; - int dstskip = info->d_skip; + int dstskip = info->dst_pitch; Uint32 ckey = info->ckey; Uint8 *palmap = info->table; int c; @@ -247,12 +247,12 @@ BlitBto1Key(SDL_BlitInfo * info) static void BlitBto2Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; - Uint16 *dstp = (Uint16 *) info->d_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; + Uint16 *dstp = (Uint16 *) info->dst; int srcskip = info->s_skip; - int dstskip = info->d_skip; + int dstskip = info->dst_pitch; Uint32 ckey = info->ckey; Uint8 *palmap = info->table; int c; @@ -282,12 +282,12 @@ BlitBto2Key(SDL_BlitInfo * info) static void BlitBto3Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; - Uint8 *dst = info->d_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; + Uint8 *dst = info->dst; int srcskip = info->s_skip; - int dstskip = info->d_skip; + int dstskip = info->dst_pitch; Uint32 ckey = info->ckey; Uint8 *palmap = info->table; int c; @@ -316,12 +316,12 @@ BlitBto3Key(SDL_BlitInfo * info) static void BlitBto4Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; - Uint32 *dstp = (Uint32 *) info->d_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; + Uint32 *dstp = (Uint32 *) info->dst; int srcskip = info->s_skip; - int dstskip = info->d_skip; + int dstskip = info->dst_pitch; Uint32 ckey = info->ckey; Uint8 *palmap = info->table; int c; @@ -351,12 +351,12 @@ BlitBto4Key(SDL_BlitInfo * info) static void BlitBtoNAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; - Uint8 *dst = info->d_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; + Uint8 *dst = info->dst; int srcskip = info->s_skip; - int dstskip = info->d_skip; + int dstskip = info->dst_pitch; const SDL_Color *srcpal = info->src->palette->colors; SDL_PixelFormat *dstfmt = info->dst; int dstbpp; @@ -396,12 +396,12 @@ BlitBtoNAlpha(SDL_BlitInfo * info) static void BlitBtoNAlphaKey(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; - Uint8 *dst = info->d_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; + Uint8 *dst = info->dst; int srcskip = info->s_skip; - int dstskip = info->d_skip; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; const SDL_Color *srcpal = srcfmt->palette->colors; diff --git a/src/video/SDL_blit_1.c b/src/video/SDL_blit_1.c index 5295c6ac6..86517ab7a 100644 --- a/src/video/SDL_blit_1.c +++ b/src/video/SDL_blit_1.c @@ -39,12 +39,12 @@ Blit1to1(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = info->src; srcskip = info->s_skip; - dst = info->d_pixels; - dstskip = info->d_skip; + dst = info->dst; + dstskip = info->dst_pitch; map = info->table; while (height--) { @@ -90,12 +90,12 @@ Blit1to2(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = info->src; srcskip = info->s_skip; - dst = info->d_pixels; - dstskip = info->d_skip; + dst = info->dst; + dstskip = info->dst_pitch; map = (Uint16 *) info->table; #ifdef USE_DUFFS_LOOP @@ -196,12 +196,12 @@ Blit1to3(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = info->src; srcskip = info->s_skip; - dst = info->d_pixels; - dstskip = info->d_skip; + dst = info->dst; + dstskip = info->dst_pitch; map = info->table; while (height--) { @@ -244,12 +244,12 @@ Blit1to4(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = info->src; srcskip = info->s_skip; - dst = (Uint32 *) info->d_pixels; - dstskip = info->d_skip / 4; + dst = (Uint32 *) info->dst; + dstskip = info->dst_pitch / 4; map = (Uint32 *) info->table; while (height--) { @@ -283,12 +283,12 @@ Blit1to4(SDL_BlitInfo * info) static void Blit1to1Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; Uint8 *palmap = info->table; Uint32 ckey = info->ckey; @@ -330,12 +330,12 @@ Blit1to1Key(SDL_BlitInfo * info) static void Blit1to2Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint16 *dstp = (Uint16 *) info->d_pixels; - int dstskip = info->d_skip; + Uint16 *dstp = (Uint16 *) info->dst; + int dstskip = info->dst_pitch; Uint16 *palmap = (Uint16 *) info->table; Uint32 ckey = info->ckey; @@ -362,12 +362,12 @@ Blit1to2Key(SDL_BlitInfo * info) static void Blit1to3Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; Uint8 *palmap = info->table; Uint32 ckey = info->ckey; int o; @@ -395,12 +395,12 @@ Blit1to3Key(SDL_BlitInfo * info) static void Blit1to4Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch; Uint32 *palmap = (Uint32 *) info->table; Uint32 ckey = info->ckey; @@ -427,12 +427,12 @@ Blit1to4Key(SDL_BlitInfo * info) static void Blit1toNAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *dstfmt = info->dst; const SDL_Color *srcpal = info->src->palette->colors; int dstbpp; @@ -468,12 +468,12 @@ Blit1toNAlpha(SDL_BlitInfo * info) static void Blit1toNAlphaKey(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; const SDL_Color *srcpal = info->src->palette->colors; diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c index 8e16b1fa6..dcd502207 100644 --- a/src/video/SDL_blit_A.c +++ b/src/video/SDL_blit_A.c @@ -30,12 +30,12 @@ static void BlitNto1SurfaceAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; Uint8 *palmap = info->table; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; @@ -86,12 +86,12 @@ BlitNto1SurfaceAlpha(SDL_BlitInfo * info) static void BlitNto1PixelAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; Uint8 *palmap = info->table; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; @@ -142,12 +142,12 @@ BlitNto1PixelAlpha(SDL_BlitInfo * info) static void BlitNto1SurfaceAlphaKey(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; Uint8 *palmap = info->table; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; @@ -203,12 +203,12 @@ BlitNto1SurfaceAlphaKey(SDL_BlitInfo * info) static void BlitRGBtoRGBSurfaceAlpha128MMX(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; Uint32 dalpha = info->dst->Amask; __m64 src1, src2, dst1, dst2, lmask, hmask, dsta; @@ -267,12 +267,12 @@ BlitRGBtoRGBSurfaceAlphaMMX(SDL_BlitInfo * info) /* only call a128 version when R,G,B occupy lower bits */ BlitRGBtoRGBSurfaceAlpha128MMX(info); } else { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; Uint32 dalpha = df->Amask; Uint32 amult; @@ -356,12 +356,12 @@ BlitRGBtoRGBSurfaceAlphaMMX(SDL_BlitInfo * info) static void BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; SDL_PixelFormat *sf = info->src; Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask; Uint32 amask = sf->Amask; @@ -542,11 +542,11 @@ calc_swizzle32(const SDL_PixelFormat * srcfmt, const SDL_PixelFormat * dstfmt) static void Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info) { - int height = info->d_height; - Uint8 *src = (Uint8 *) info->s_pixels; + int height = info->dst_h; + Uint8 *src = (Uint8 *) info->src; int srcskip = info->s_skip; - Uint8 *dst = (Uint8 *) info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = (Uint8 *) info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; vector unsigned char v0 = vec_splat_u8(0); @@ -617,7 +617,7 @@ Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info) vector unsigned char valigner; vector unsigned char vsrc; vector unsigned char voverflow; - int width = info->d_width; + int width = info->dst_w; #define ONE_PIXEL_BLEND(condition, widthvar) \ while (condition) { \ @@ -718,11 +718,11 @@ Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info) static void Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info) { - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; unsigned sA = (info->cmod >> 24); @@ -766,7 +766,7 @@ Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info) vrgbmask = vec_splat(vrgbmask, 0); while (height--) { - int width = info->d_width; + int width = info->dst_w; #define ONE_PIXEL_BLEND(condition, widthvar) \ while (condition) { \ Uint32 Pixel; \ @@ -844,12 +844,12 @@ Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info) static void Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; vector unsigned char mergePermute; @@ -875,7 +875,7 @@ Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info) vsdstPermute = calc_swizzle32(dstfmt, NULL); while (height--) { - width = info->d_width; + width = info->dst_w; #define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \ Uint32 Pixel; \ unsigned sR, sG, sB, dR, dG, dB, sA, dA; \ @@ -942,12 +942,12 @@ Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info) static void BlitRGBtoRGBPixelAlphaAltivec(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; vector unsigned char mergePermute; vector unsigned char valphaPermute; vector unsigned char valphamask; @@ -965,7 +965,7 @@ BlitRGBtoRGBPixelAlphaAltivec(SDL_BlitInfo * info) vpixelmask = vec_nor(valphamask, v0); while (height--) { - width = info->d_width; + width = info->dst_w; #define ONE_PIXEL_BLEND(condition, widthvar) \ while ((condition)) { \ Uint32 dalpha; \ @@ -1040,11 +1040,11 @@ static void Blit32to32SurfaceAlphaAltivec(SDL_BlitInfo * info) { /* XXX : 6 */ - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; unsigned sA = (info->cmod >> 24); @@ -1076,7 +1076,7 @@ Blit32to32SurfaceAlphaAltivec(SDL_BlitInfo * info) vbits = (vector unsigned char) vec_splat_s8(-1); while (height--) { - int width = info->d_width; + int width = info->dst_w; #define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \ Uint32 Pixel; \ unsigned sR, sG, sB, dR, dG, dB; \ @@ -1137,11 +1137,11 @@ static void BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info) { unsigned alpha = (info->cmod >> 24); - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; vector unsigned char mergePermute; vector unsigned char valpha; vector unsigned char valphamask; @@ -1160,7 +1160,7 @@ BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info) valpha = vec_splat(valpha, 0); while (height--) { - int width = info->d_width; + int width = info->dst_w; #define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \ Uint32 s = *srcp; \ Uint32 d = *dstp; \ @@ -1224,12 +1224,12 @@ BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info) static void BlitRGBtoRGBSurfaceAlpha128(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; while (height--) { /* *INDENT-OFF* */ @@ -1253,12 +1253,12 @@ BlitRGBtoRGBSurfaceAlpha(SDL_BlitInfo * info) if (alpha == 128) { BlitRGBtoRGBSurfaceAlpha128(info); } else { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; Uint32 s; Uint32 d; Uint32 s1; @@ -1321,12 +1321,12 @@ BlitRGBtoRGBSurfaceAlpha(SDL_BlitInfo * info) static void BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; while (height--) { /* *INDENT-OFF* */ @@ -1374,12 +1374,12 @@ BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * info) static void BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip >> 2; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch >> 2; SDL_PixelFormat *sf = info->src; Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask; Uint32 amask = sf->Amask; @@ -1456,12 +1456,12 @@ BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info) static void Blit16to16SurfaceAlpha128(SDL_BlitInfo * info, Uint16 mask) { - int width = info->d_width; - int height = info->d_height; - Uint16 *srcp = (Uint16 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint16 *srcp = (Uint16 *) info->src; int srcskip = info->s_skip >> 1; - Uint16 *dstp = (Uint16 *) info->d_pixels; - int dstskip = info->d_skip >> 1; + Uint16 *dstp = (Uint16 *) info->dst; + int dstskip = info->dst_pitch >> 1; while (height--) { if (((uintptr_t) srcp ^ (uintptr_t) dstp) & 2) { @@ -1562,12 +1562,12 @@ Blit565to565SurfaceAlphaMMX(SDL_BlitInfo * info) if (alpha == 128) { Blit16to16SurfaceAlpha128(info, 0xf7de); } else { - int width = info->d_width; - int height = info->d_height; - Uint16 *srcp = (Uint16 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint16 *srcp = (Uint16 *) info->src; int srcskip = info->s_skip >> 1; - Uint16 *dstp = (Uint16 *) info->d_pixels; - int dstskip = info->d_skip >> 1; + Uint16 *dstp = (Uint16 *) info->dst; + int dstskip = info->dst_pitch >> 1; Uint32 s, d; __m64 src1, dst1, src2, dst2, gmask, bmask, mm_res, mm_alpha; @@ -1699,12 +1699,12 @@ Blit555to555SurfaceAlphaMMX(SDL_BlitInfo * info) if (alpha == 128) { Blit16to16SurfaceAlpha128(info, 0xfbde); } else { - int width = info->d_width; - int height = info->d_height; - Uint16 *srcp = (Uint16 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint16 *srcp = (Uint16 *) info->src; int srcskip = info->s_skip >> 1; - Uint16 *dstp = (Uint16 *) info->d_pixels; - int dstskip = info->d_skip >> 1; + Uint16 *dstp = (Uint16 *) info->dst; + int dstskip = info->dst_pitch >> 1; Uint32 s, d; __m64 src1, dst1, src2, dst2, rmask, gmask, bmask, mm_res, mm_alpha; @@ -1839,12 +1839,12 @@ Blit565to565SurfaceAlpha(SDL_BlitInfo * info) if (alpha == 128) { Blit16to16SurfaceAlpha128(info, 0xf7de); } else { - int width = info->d_width; - int height = info->d_height; - Uint16 *srcp = (Uint16 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint16 *srcp = (Uint16 *) info->src; int srcskip = info->s_skip >> 1; - Uint16 *dstp = (Uint16 *) info->d_pixels; - int dstskip = info->d_skip >> 1; + Uint16 *dstp = (Uint16 *) info->dst; + int dstskip = info->dst_pitch >> 1; alpha >>= 3; /* downscale alpha to 5 bits */ while (height--) { @@ -1878,12 +1878,12 @@ Blit555to555SurfaceAlpha(SDL_BlitInfo * info) if (alpha == 128) { Blit16to16SurfaceAlpha128(info, 0xfbde); } else { - int width = info->d_width; - int height = info->d_height; - Uint16 *srcp = (Uint16 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint16 *srcp = (Uint16 *) info->src; int srcskip = info->s_skip >> 1; - Uint16 *dstp = (Uint16 *) info->d_pixels; - int dstskip = info->d_skip >> 1; + Uint16 *dstp = (Uint16 *) info->dst; + int dstskip = info->dst_pitch >> 1; alpha >>= 3; /* downscale alpha to 5 bits */ while (height--) { @@ -1913,12 +1913,12 @@ Blit555to555SurfaceAlpha(SDL_BlitInfo * info) static void BlitARGBto565PixelAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint16 *dstp = (Uint16 *) info->d_pixels; - int dstskip = info->d_skip >> 1; + Uint16 *dstp = (Uint16 *) info->dst; + int dstskip = info->dst_pitch >> 1; while (height--) { /* *INDENT-OFF* */ @@ -1959,12 +1959,12 @@ BlitARGBto565PixelAlpha(SDL_BlitInfo * info) static void BlitARGBto555PixelAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip >> 2; - Uint16 *dstp = (Uint16 *) info->d_pixels; - int dstskip = info->d_skip >> 1; + Uint16 *dstp = (Uint16 *) info->dst; + int dstskip = info->dst_pitch >> 1; while (height--) { /* *INDENT-OFF* */ @@ -2006,12 +2006,12 @@ BlitARGBto555PixelAlpha(SDL_BlitInfo * info) static void BlitNtoNSurfaceAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; int srcbpp = srcfmt->BytesPerPixel; @@ -2050,12 +2050,12 @@ BlitNtoNSurfaceAlpha(SDL_BlitInfo * info) static void BlitNtoNSurfaceAlphaKey(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; Uint32 ckey = info->ckey; @@ -2096,12 +2096,12 @@ BlitNtoNSurfaceAlphaKey(SDL_BlitInfo * info) static void BlitNtoNPixelAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c index b8f751b1e..70c3fb7a7 100644 --- a/src/video/SDL_blit_N.c +++ b/src/video/SDL_blit_N.c @@ -158,11 +158,11 @@ static void Blit_RGB888_RGB565(SDL_BlitInfo * info); static void Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info) { - int height = info->d_height; - Uint8 *src = (Uint8 *) info->s_pixels; + int height = info->dst_h; + Uint8 *src = (Uint8 *) info->src; int srcskip = info->s_skip; - Uint8 *dst = (Uint8 *) info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = (Uint8 *) info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; vector unsigned char valpha = vec_splat_u8(0); vector unsigned char vpermute = calc_swizzle32(srcfmt, NULL); @@ -186,7 +186,7 @@ Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info) vector unsigned char voverflow; vector unsigned char vsrc; - int width = info->d_width; + int width = info->dst_w; int extrawidth; /* do scalar until we can align... */ @@ -262,11 +262,11 @@ Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info) static void Blit_RGB565_32Altivec(SDL_BlitInfo * info) { - int height = info->d_height; - Uint8 *src = (Uint8 *) info->s_pixels; + int height = info->dst_h; + Uint8 *src = (Uint8 *) info->src; int srcskip = info->s_skip; - Uint8 *dst = (Uint8 *) info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = (Uint8 *) info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; unsigned alpha; @@ -336,7 +336,7 @@ Blit_RGB565_32Altivec(SDL_BlitInfo * info) vector unsigned char voverflow; vector unsigned char vsrc; - int width = info->d_width; + int width = info->dst_w; int extrawidth; /* do scalar until we can align... */ @@ -410,11 +410,11 @@ Blit_RGB565_32Altivec(SDL_BlitInfo * info) static void Blit_RGB555_32Altivec(SDL_BlitInfo * info) { - int height = info->d_height; - Uint8 *src = (Uint8 *) info->s_pixels; + int height = info->dst_h; + Uint8 *src = (Uint8 *) info->src; int srcskip = info->s_skip; - Uint8 *dst = (Uint8 *) info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = (Uint8 *) info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; unsigned alpha; @@ -484,7 +484,7 @@ Blit_RGB555_32Altivec(SDL_BlitInfo * info) vector unsigned char voverflow; vector unsigned char vsrc; - int width = info->d_width; + int width = info->dst_w; int extrawidth; /* do scalar until we can align... */ @@ -559,11 +559,11 @@ static void BlitNtoNKeyCopyAlpha(SDL_BlitInfo * info); static void Blit32to32KeyAltivec(SDL_BlitInfo * info) { - int height = info->d_height; - Uint32 *srcp = (Uint32 *) info->s_pixels; + int height = info->dst_h; + Uint32 *srcp = (Uint32 *) info->src; int srcskip = info->s_skip; - Uint32 *dstp = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip; + Uint32 *dstp = (Uint32 *) info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; int srcbpp = srcfmt->BytesPerPixel; SDL_PixelFormat *dstfmt = info->dst; @@ -578,7 +578,7 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info) vector unsigned int vckey; vector unsigned int vrgbmask; vpermute = calc_swizzle32(srcfmt, dstfmt); - if (info->d_width < 16) { + if (info->dst_w < 16) { if (copy_alpha) { BlitNtoNKeyCopyAlpha(info); } else { @@ -631,7 +631,7 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info) widthvar--; \ } \ } - int width = info->d_width; + int width = info->dst_w; ONE_PIXEL_BLEND((UNALIGNED_PTR(dstp)) && (width), width); assert(width > 0); if (width > 0) { @@ -677,11 +677,11 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info) static void ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info) { - int height = info->d_height; - Uint32 *src = (Uint32 *) info->s_pixels; + int height = info->dst_h; + Uint32 *src = (Uint32 *) info->src; int srcskip = info->s_skip; - Uint32 *dst = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip; + Uint32 *dst = (Uint32 *) info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; vector unsigned int vzero = vec_splat_u32(0); @@ -704,7 +704,7 @@ ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info) Uint32 bits; Uint8 r, g, b, a; - int width = info->d_width; + int width = info->dst_w; int extrawidth; /* do scalar until we can align... */ @@ -756,11 +756,11 @@ ConvertAltivec32to32_prefetch(SDL_BlitInfo * info) const int scalar_dst_lead = sizeof(Uint32) * 4; const int vector_dst_lead = sizeof(Uint32) * 16; - int height = info->d_height; - Uint32 *src = (Uint32 *) info->s_pixels; + int height = info->dst_h; + Uint32 *src = (Uint32 *) info->src; int srcskip = info->s_skip; - Uint32 *dst = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip; + Uint32 *dst = (Uint32 *) info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; vector unsigned int vzero = vec_splat_u32(0); @@ -783,7 +783,7 @@ ConvertAltivec32to32_prefetch(SDL_BlitInfo * info) Uint32 bits; Uint8 r, g, b, a; - int width = info->d_width; + int width = info->dst_w; int extrawidth; /* do scalar until we can align... */ @@ -898,12 +898,12 @@ Blit_RGB888_index8(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = (Uint32 *) info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = (Uint32 *) info->src; srcskip = info->s_skip / 4; - dst = info->d_pixels; - dstskip = info->d_skip; + dst = info->dst; + dstskip = info->dst_pitch; map = info->table; if (map == NULL) { @@ -1015,12 +1015,12 @@ Blit_RGB888_RGB555(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = (Uint32 *) info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = (Uint32 *) info->src; srcskip = info->s_skip / 4; - dst = (Uint16 *) info->d_pixels; - dstskip = info->d_skip / 2; + dst = (Uint16 *) info->dst; + dstskip = info->dst_pitch / 2; #ifdef USE_DUFFS_LOOP while (height--) { @@ -1139,12 +1139,12 @@ Blit_RGB888_RGB565(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = (Uint32 *) info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = (Uint32 *) info->src; srcskip = info->s_skip / 4; - dst = (Uint16 *) info->d_pixels; - dstskip = info->d_skip / 2; + dst = (Uint16 *) info->dst; + dstskip = info->dst_pitch / 2; #ifdef USE_DUFFS_LOOP while (height--) { @@ -1252,12 +1252,12 @@ Blit_RGB565_32(SDL_BlitInfo * info, const Uint32 * map) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = (Uint8 *) info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = (Uint8 *) info->src; srcskip = info->s_skip; - dst = (Uint32 *) info->d_pixels; - dstskip = info->d_skip / 4; + dst = (Uint32 *) info->dst; + dstskip = info->dst_pitch / 4; #ifdef USE_DUFFS_LOOP while (height--) { @@ -1874,12 +1874,12 @@ Blit_RGB888_index8_map(SDL_BlitInfo * info) int srcskip, dstskip; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = (Uint32 *) info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = (Uint32 *) info->src; srcskip = info->s_skip / 4; - dst = info->d_pixels; - dstskip = info->d_skip; + dst = info->dst; + dstskip = info->dst_pitch; map = info->table; #ifdef USE_DUFFS_LOOP @@ -1947,12 +1947,12 @@ BlitNto1(SDL_BlitInfo * info) SDL_PixelFormat *srcfmt; /* Set up some basic variables */ - width = info->d_width; - height = info->d_height; - src = info->s_pixels; + width = info->dst_w; + height = info->dst_h; + src = info->src; srcskip = info->s_skip; - dst = info->d_pixels; - dstskip = info->d_skip; + dst = info->dst; + dstskip = info->dst_pitch; map = info->table; srcfmt = info->src; srcbpp = srcfmt->BytesPerPixel; @@ -2028,12 +2028,12 @@ BlitNto1(SDL_BlitInfo * info) static void Blit4to4MaskAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint32 *src = (Uint32 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint32 *src = (Uint32 *) info->src; int srcskip = info->s_skip; - Uint32 *dst = (Uint32 *) info->d_pixels; - int dstskip = info->d_skip; + Uint32 *dst = (Uint32 *) info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; @@ -2077,12 +2077,12 @@ Blit4to4MaskAlpha(SDL_BlitInfo * info) static void BlitNtoN(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; int srcbpp = srcfmt->BytesPerPixel; SDL_PixelFormat *dstfmt = info->dst; @@ -2112,12 +2112,12 @@ BlitNtoN(SDL_BlitInfo * info) static void BlitNtoNCopyAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; int srcbpp = srcfmt->BytesPerPixel; SDL_PixelFormat *dstfmt = info->dst; @@ -2142,12 +2142,12 @@ BlitNtoNCopyAlpha(SDL_BlitInfo * info) static void BlitNto1Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; SDL_PixelFormat *srcfmt = info->src; const Uint8 *palmap = info->table; Uint32 ckey = info->ckey; @@ -2208,12 +2208,12 @@ BlitNto1Key(SDL_BlitInfo * info) static void Blit2to2Key(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint16 *srcp = (Uint16 *) info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint16 *srcp = (Uint16 *) info->src; int srcskip = info->s_skip; - Uint16 *dstp = (Uint16 *) info->d_pixels; - int dstskip = info->d_skip; + Uint16 *dstp = (Uint16 *) info->dst; + int dstskip = info->dst_pitch; Uint32 ckey = info->ckey; Uint32 rgbmask = ~info->src->Amask; @@ -2242,12 +2242,12 @@ Blit2to2Key(SDL_BlitInfo * info) static void BlitNtoNKey(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; Uint32 ckey = info->ckey; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; @@ -2285,12 +2285,12 @@ BlitNtoNKey(SDL_BlitInfo * info) static void BlitNtoNKeyCopyAlpha(SDL_BlitInfo * info) { - int width = info->d_width; - int height = info->d_height; - Uint8 *src = info->s_pixels; + int width = info->dst_w; + int height = info->dst_h; + Uint8 *src = info->src; int srcskip = info->s_skip; - Uint8 *dst = info->d_pixels; - int dstskip = info->d_skip; + Uint8 *dst = info->dst; + int dstskip = info->dst_pitch; Uint32 ckey = info->ckey; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; diff --git a/src/video/SDL_rendercopy.c b/src/video/SDL_blit_auto.c similarity index 60% rename from src/video/SDL_rendercopy.c rename to src/video/SDL_blit_auto.c index a92575df6..b555d9928 100644 --- a/src/video/SDL_rendercopy.c +++ b/src/video/SDL_blit_auto.c @@ -25,143 +25,115 @@ /* *INDENT-OFF* */ #include "SDL_video.h" -#include "SDL_rendercopy.h" - -static struct { - Uint32 src_format; - Uint32 dst_format; - int modMode; - int blendMode; - int scaleMode; - SDL_RenderCopyFunc func; -} SDL_RenderCopyFuncTable[] = { - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGB888_RGB888_Scale }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_RGB888_RGB888_Blend }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGB888_RGB888_Blend_Scale }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_RGB888_RGB888_Modulate }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGB888_RGB888_Modulate_Scale }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_RGB888_RGB888_Modulate_Blend }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGB888_RGB888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGB888_BGR888_Scale }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_RGB888_BGR888_Blend }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGB888_BGR888_Blend_Scale }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_RGB888_BGR888_Modulate }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGB888_BGR888_Modulate_Scale }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_RGB888_BGR888_Modulate_Blend }, - { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGB888_BGR888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGR888_RGB888_Scale }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_BGR888_RGB888_Blend }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGR888_RGB888_Blend_Scale }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_BGR888_RGB888_Modulate }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGR888_RGB888_Modulate_Scale }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_BGR888_RGB888_Modulate_Blend }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGR888_RGB888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGR888_BGR888_Scale }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_BGR888_BGR888_Blend }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGR888_BGR888_Blend_Scale }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_BGR888_BGR888_Modulate }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGR888_BGR888_Modulate_Scale }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_BGR888_BGR888_Modulate_Blend }, - { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGR888_BGR888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ARGB8888_RGB888_Scale }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_ARGB8888_RGB888_Blend }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ARGB8888_RGB888_Blend_Scale }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_ARGB8888_RGB888_Modulate }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ARGB8888_RGB888_Modulate_Scale }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ARGB8888_BGR888_Scale }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_ARGB8888_BGR888_Blend }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ARGB8888_BGR888_Blend_Scale }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_ARGB8888_BGR888_Modulate }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ARGB8888_BGR888_Modulate_Scale }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend }, - { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGBA8888_RGB888_Scale }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_RGBA8888_RGB888_Blend }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGBA8888_RGB888_Blend_Scale }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_RGBA8888_RGB888_Modulate }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGBA8888_RGB888_Modulate_Scale }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGBA8888_BGR888_Scale }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_RGBA8888_BGR888_Blend }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGBA8888_BGR888_Blend_Scale }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_RGBA8888_BGR888_Modulate }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGBA8888_BGR888_Modulate_Scale }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend }, - { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ABGR8888_RGB888_Scale }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_ABGR8888_RGB888_Blend }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ABGR8888_RGB888_Blend_Scale }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_ABGR8888_RGB888_Modulate }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ABGR8888_RGB888_Modulate_Scale }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ABGR8888_BGR888_Scale }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_ABGR8888_BGR888_Blend }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ABGR8888_BGR888_Blend_Scale }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_ABGR8888_BGR888_Modulate }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ABGR8888_BGR888_Modulate_Scale }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend }, - { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGRA8888_RGB888_Scale }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_BGRA8888_RGB888_Blend }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGRA8888_RGB888_Blend_Scale }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_BGRA8888_RGB888_Modulate }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGRA8888_RGB888_Modulate_Scale }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend_Scale }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, 0, 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGRA8888_BGR888_Scale }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_BGRA8888_BGR888_Blend }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, 0, (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGRA8888_BGR888_Blend_Scale }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, 0, SDL_RenderCopy_BGRA8888_BGR888_Modulate }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), 0, SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGRA8888_BGR888_Modulate_Scale }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), 0, SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend }, - { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), SDL_TEXTURESCALEMODE_FAST, SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend_Scale }, +#include "SDL_blit.h" +#include "SDL_blit_auto.h" + +static SDL_BlitFuncEntry _SDL_GeneratedBlitFuncTable[] = { + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Scale }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Blend }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Blend_Scale }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Modulate }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Modulate_Scale }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Modulate_Blend }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Scale }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Blend }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Blend_Scale }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Modulate }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Modulate_Scale }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Modulate_Blend }, + { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Scale }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Blend }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Blend_Scale }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Modulate }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Modulate_Scale }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Modulate_Blend }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Scale }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Blend }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Blend_Scale }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Modulate }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Modulate_Scale }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Modulate_Blend }, + { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Scale }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Blend }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Blend_Scale }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Modulate }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Modulate_Scale }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Modulate_Blend }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Scale }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Blend }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Blend_Scale }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Modulate }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Modulate_Scale }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Modulate_Blend }, + { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Scale }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Blend }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Blend_Scale }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Modulate }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Modulate_Scale }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Modulate_Blend }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Scale }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Blend }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Blend_Scale }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Modulate }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Modulate_Scale }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Modulate_Blend }, + { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Scale }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Blend }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Blend_Scale }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Modulate }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Modulate_Scale }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Modulate_Blend }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Scale }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Blend }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Blend_Scale }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Modulate }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Modulate_Scale }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Modulate_Blend }, + { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Scale }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Blend }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Blend_Scale }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Modulate }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Modulate_Scale }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Modulate_Blend }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Modulate_Blend_Scale }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Scale }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Blend }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Blend_Scale }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Modulate }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Modulate_Scale }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Modulate_Blend }, + { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Modulate_Blend_Scale }, + { 0, 0, 0, 0, NULL } }; -SDL_RenderCopyFunc SDL_GetRenderCopyFunc(Uint32 src_format, Uint32 dst_format, int modMode, int blendMode, int scaleMode) -{ - 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; -} +SDL_BlitFuncEntry *SDL_GeneratedBlitFuncTable = _SDL_GeneratedBlitFuncTable; -int SDL_RenderCopy_RGB888_RGB888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_RGB888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; int srcy, srcx; int posy, posx; int incy, incx; srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -174,36 +146,35 @@ int SDL_RenderCopy_RGB888_RGB888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } *dst = *src; posx += incx; ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_RGB888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_RGB888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -211,25 +182,25 @@ int SDL_RenderCopy_RGB888_RGB888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -240,15 +211,14 @@ int SDL_RenderCopy_RGB888_RGB888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_RGB888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_RGB888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -259,13 +229,13 @@ int SDL_RenderCopy_RGB888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -278,13 +248,13 @@ int SDL_RenderCopy_RGB888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -292,25 +262,25 @@ int SDL_RenderCopy_RGB888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -322,34 +292,33 @@ int SDL_RenderCopy_RGB888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_RGB888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_RGB888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -357,19 +326,18 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_RGB888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -378,13 +346,13 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -397,16 +365,16 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -415,41 +383,40 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_RGB888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -457,25 +424,25 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -486,19 +453,18 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -509,13 +475,13 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -528,21 +494,21 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -550,25 +516,25 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -580,14 +546,13 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_BGR888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_BGR888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -596,13 +561,13 @@ int SDL_RenderCopy_RGB888_BGR888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -615,7 +580,7 @@ int SDL_RenderCopy_RGB888_BGR888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF; @@ -625,29 +590,28 @@ int SDL_RenderCopy_RGB888_BGR888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_BGR888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_BGR888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -655,25 +619,25 @@ int SDL_RenderCopy_RGB888_BGR888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -684,15 +648,14 @@ int SDL_RenderCopy_RGB888_BGR888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_BGR888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_BGR888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -703,13 +666,13 @@ int SDL_RenderCopy_RGB888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -722,13 +685,13 @@ int SDL_RenderCopy_RGB888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -736,25 +699,25 @@ int SDL_RenderCopy_RGB888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -766,34 +729,33 @@ int SDL_RenderCopy_RGB888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_BGR888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_BGR888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -801,19 +763,18 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_BGR888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -822,13 +783,13 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -841,16 +802,16 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -859,41 +820,40 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_BGR888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -901,25 +861,25 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -930,19 +890,18 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGB888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -953,13 +912,13 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -972,21 +931,21 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -994,25 +953,25 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -1024,14 +983,13 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_RGB888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_RGB888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -1040,13 +998,13 @@ int SDL_RenderCopy_BGR888_RGB888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -1059,7 +1017,7 @@ int SDL_RenderCopy_BGR888_RGB888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF; @@ -1069,29 +1027,28 @@ int SDL_RenderCopy_BGR888_RGB888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_RGB888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_RGB888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -1099,25 +1056,25 @@ int SDL_RenderCopy_BGR888_RGB888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -1128,15 +1085,14 @@ int SDL_RenderCopy_BGR888_RGB888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_RGB888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_RGB888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -1147,13 +1103,13 @@ int SDL_RenderCopy_BGR888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -1166,13 +1122,13 @@ int SDL_RenderCopy_BGR888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -1180,25 +1136,25 @@ int SDL_RenderCopy_BGR888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -1210,34 +1166,33 @@ int SDL_RenderCopy_BGR888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_RGB888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_RGB888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -1245,19 +1200,18 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_RGB888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -1266,13 +1220,13 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -1285,16 +1239,16 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -1303,41 +1257,40 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_RGB888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -1345,25 +1298,25 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -1374,19 +1327,18 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -1397,13 +1349,13 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -1416,21 +1368,21 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -1438,25 +1390,25 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -1468,27 +1420,26 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_BGR888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_BGR888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; int srcy, srcx; int posy, posx; int incy, incx; srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -1501,36 +1452,35 @@ int SDL_RenderCopy_BGR888_BGR888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } *dst = *src; posx += incx; ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_BGR888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_BGR888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -1538,25 +1488,25 @@ int SDL_RenderCopy_BGR888_BGR888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -1567,15 +1517,14 @@ int SDL_RenderCopy_BGR888_BGR888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_BGR888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_BGR888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -1586,13 +1535,13 @@ int SDL_RenderCopy_BGR888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -1605,13 +1554,13 @@ int SDL_RenderCopy_BGR888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -1619,25 +1568,25 @@ int SDL_RenderCopy_BGR888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -1649,34 +1598,33 @@ int SDL_RenderCopy_BGR888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_BGR888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_BGR888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -1684,19 +1632,18 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_BGR888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -1705,13 +1652,13 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -1724,16 +1671,16 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -1742,41 +1689,40 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_BGR888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -1784,25 +1730,25 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -1813,19 +1759,18 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGR888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -1836,13 +1781,13 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -1855,21 +1800,21 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -1877,25 +1822,25 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -1907,14 +1852,13 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_RGB888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_RGB888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -1923,13 +1867,13 @@ int SDL_RenderCopy_ARGB8888_RGB888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -1942,7 +1886,7 @@ int SDL_RenderCopy_ARGB8888_RGB888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; @@ -1952,29 +1896,28 @@ int SDL_RenderCopy_ARGB8888_RGB888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_RGB888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_RGB888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -1982,25 +1925,25 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2011,15 +1954,14 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_RGB888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -2030,13 +1972,13 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -2049,13 +1991,13 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -2063,25 +2005,25 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2093,34 +2035,33 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_RGB888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_RGB888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -2128,19 +2069,18 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_RGB888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -2149,13 +2089,13 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -2168,16 +2108,16 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -2186,41 +2126,40 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_RGB888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -2228,25 +2167,25 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2257,19 +2196,18 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -2280,13 +2218,13 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -2299,21 +2237,21 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -2321,25 +2259,25 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2351,14 +2289,13 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_BGR888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_BGR888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -2367,13 +2304,13 @@ int SDL_RenderCopy_ARGB8888_BGR888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -2386,7 +2323,7 @@ int SDL_RenderCopy_ARGB8888_BGR888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; @@ -2396,29 +2333,28 @@ int SDL_RenderCopy_ARGB8888_BGR888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_BGR888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_BGR888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -2426,25 +2362,25 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2455,15 +2391,14 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_BGR888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -2474,13 +2409,13 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -2493,13 +2428,13 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -2507,25 +2442,25 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2537,34 +2472,33 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_BGR888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_BGR888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -2572,19 +2506,18 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_BGR888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -2593,13 +2526,13 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -2612,16 +2545,16 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -2630,41 +2563,40 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_BGR888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -2672,25 +2604,25 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2701,19 +2633,18 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -2724,13 +2655,13 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -2743,21 +2674,21 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -2765,25 +2696,25 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2795,14 +2726,13 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_RGB888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_RGB888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -2811,13 +2741,13 @@ int SDL_RenderCopy_RGBA8888_RGB888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -2830,7 +2760,7 @@ int SDL_RenderCopy_RGBA8888_RGB888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel; @@ -2840,29 +2770,28 @@ int SDL_RenderCopy_RGBA8888_RGB888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_RGB888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_RGB888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -2870,25 +2799,25 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2899,15 +2828,14 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_RGB888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -2918,13 +2846,13 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -2937,13 +2865,13 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -2951,25 +2879,25 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -2981,34 +2909,33 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_RGB888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_RGB888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -3016,19 +2943,18 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_RGB888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -3037,13 +2963,13 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -3056,16 +2982,16 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -3074,41 +3000,40 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_RGB888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -3116,25 +3041,25 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -3145,19 +3070,18 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -3168,13 +3092,13 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -3187,21 +3111,21 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -3209,25 +3133,25 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -3239,14 +3163,13 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_BGR888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_BGR888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -3255,13 +3178,13 @@ int SDL_RenderCopy_RGBA8888_BGR888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -3274,7 +3197,7 @@ int SDL_RenderCopy_RGBA8888_BGR888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel; @@ -3284,29 +3207,28 @@ int SDL_RenderCopy_RGBA8888_BGR888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_BGR888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_BGR888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -3314,25 +3236,25 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -3343,15 +3265,14 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_BGR888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -3362,13 +3283,13 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -3381,13 +3302,13 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -3395,25 +3316,25 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -3425,34 +3346,33 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_BGR888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_BGR888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -3460,19 +3380,18 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_BGR888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -3481,13 +3400,13 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -3500,16 +3419,16 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -3518,41 +3437,40 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_BGR888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -3560,25 +3478,25 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -3589,19 +3507,18 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -3612,13 +3529,13 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -3631,21 +3548,21 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -3653,25 +3570,25 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -3683,14 +3600,13 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_RGB888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_RGB888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -3699,13 +3615,13 @@ int SDL_RenderCopy_ABGR8888_RGB888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -3718,7 +3634,7 @@ int SDL_RenderCopy_ABGR8888_RGB888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; @@ -3728,29 +3644,28 @@ int SDL_RenderCopy_ABGR8888_RGB888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_RGB888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_RGB888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -3758,25 +3673,25 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -3787,15 +3702,14 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_RGB888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -3806,13 +3720,13 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -3825,13 +3739,13 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -3839,25 +3753,25 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -3869,34 +3783,33 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_RGB888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_RGB888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -3904,19 +3817,18 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_RGB888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -3925,13 +3837,13 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -3944,16 +3856,16 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -3962,41 +3874,40 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_RGB888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4004,25 +3915,25 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -4033,19 +3944,18 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -4056,13 +3966,13 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -4075,21 +3985,21 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4097,25 +4007,25 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -4127,14 +4037,13 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_BGR888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_BGR888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -4143,13 +4052,13 @@ int SDL_RenderCopy_ABGR8888_BGR888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -4162,7 +4071,7 @@ int SDL_RenderCopy_ABGR8888_BGR888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; @@ -4172,29 +4081,28 @@ int SDL_RenderCopy_ABGR8888_BGR888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_BGR888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_BGR888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4202,25 +4110,25 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -4231,15 +4139,14 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_BGR888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -4250,13 +4157,13 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -4269,13 +4176,13 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4283,25 +4190,25 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -4313,34 +4220,33 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_BGR888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_BGR888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -4348,19 +4254,18 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_BGR888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -4369,13 +4274,13 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -4388,16 +4293,16 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -4406,41 +4311,40 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_BGR888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4448,25 +4352,25 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -4477,19 +4381,18 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -4500,13 +4403,13 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -4519,21 +4422,21 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4541,25 +4444,25 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -4571,14 +4474,13 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_RGB888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_RGB888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -4587,13 +4489,13 @@ int SDL_RenderCopy_BGRA8888_RGB888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -4606,7 +4508,7 @@ int SDL_RenderCopy_BGRA8888_RGB888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel; @@ -4616,29 +4518,28 @@ int SDL_RenderCopy_BGRA8888_RGB888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_RGB888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_RGB888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4646,25 +4547,25 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -4675,15 +4576,14 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_RGB888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -4694,13 +4594,13 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -4713,13 +4613,13 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4727,25 +4627,25 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -4757,34 +4657,33 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_RGB888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_RGB888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -4792,19 +4691,18 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_RGB888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -4813,13 +4711,13 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -4832,16 +4730,16 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; @@ -4850,41 +4748,40 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_RGB888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4892,25 +4789,25 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -4921,19 +4818,18 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -4944,13 +4840,13 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -4963,21 +4859,21 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -4985,25 +4881,25 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -5015,14 +4911,13 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_BGR888_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_BGR888_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -5031,13 +4926,13 @@ int SDL_RenderCopy_BGRA8888_BGR888_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -5050,7 +4945,7 @@ int SDL_RenderCopy_BGRA8888_BGR888_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel; @@ -5060,29 +4955,28 @@ int SDL_RenderCopy_BGRA8888_BGR888_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_BGR888_Blend(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_BGR888_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -5090,25 +4984,25 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -5119,15 +5013,14 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_BGR888_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; + const int flags = info->flags; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -5138,13 +5031,13 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -5157,13 +5050,13 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -5171,25 +5064,25 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -5201,34 +5094,33 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_BGR888_Modulate(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_BGR888_Modulate(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { pixel = *src; B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -5236,19 +5128,18 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_BGR888_Modulate_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 pixel; Uint32 R, G, B, A; int srcy, srcx; @@ -5257,13 +5148,13 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -5276,16 +5167,16 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } pixel = *src; B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { R = (R * modulateR) / 255; G = (G * modulateG) / 255; B = (B * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { A = (A * modulateA) / 255; } pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; @@ -5294,41 +5185,40 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_BGR888_Modulate_Blend(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; Uint32 dstR, dstG, dstB, dstA; - while (data->dst_h--) { - Uint32 *src = (Uint32 *)data->src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + Uint32 *src = (Uint32 *)info->src; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; while (n--) { srcpixel = *src; srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -5336,25 +5226,25 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -5365,19 +5255,18 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } - return 0; } -int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) +void SDL_Blit_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info) { - const int flags = data->flags; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const int flags = info->flags; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; Uint32 srcpixel; Uint32 srcR, srcG, srcB, srcA; Uint32 dstpixel; @@ -5388,13 +5277,13 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { Uint32 *src; - Uint32 *dst = (Uint32 *)data->dst; - int n = data->dst_w; + Uint32 *dst = (Uint32 *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -5407,21 +5296,21 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++srcx; posx -= 0x10000L; } - src = (Uint32 *)(data->src + (srcy * data->src_pitch) + (srcx * 4)); + src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4)); } srcpixel = *src; srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel; dstpixel = *dst; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { srcR = (srcR * modulateR) / 255; srcG = (srcG * modulateG) / 255; srcB = (srcB * modulateB) / 255; } - if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { + if (flags & SDL_COPY_MODULATE_ALPHA) { srcA = (srcA * modulateA) / 255; } - 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 */ if (srcA < 255) { srcR = (srcR * srcA) / 255; @@ -5429,25 +5318,25 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data srcB = (srcB * srcA) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (srcA) { dstR = srcR; dstG = srcG; dstB = srcB; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: dstR = srcR + dstR; if (dstR > 255) dstR = 255; dstG = srcG + dstG; if (dstG > 255) dstG = 255; dstB = srcB + dstB; if (dstB > 255) dstB = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: dstR = (srcR * dstR) / 255; dstG = (srcG * dstG) / 255; dstB = (srcB * dstB) / 255; @@ -5459,9 +5348,8 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } - return 0; } /* *INDENT-ON* */ diff --git a/src/video/SDL_blit_auto.h b/src/video/SDL_blit_auto.h new file mode 100644 index 000000000..39f3ac32e --- /dev/null +++ b/src/video/SDL_blit_auto.h @@ -0,0 +1,31 @@ +/* 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: */ diff --git a/src/video/SDL_blit_copy.c b/src/video/SDL_blit_copy.c index 4ba2c19ff..251e8e2fa 100644 --- a/src/video/SDL_blit_copy.c +++ b/src/video/SDL_blit_copy.c @@ -95,12 +95,12 @@ SDL_BlitCopy(SDL_BlitInfo * info) int w, h; int srcskip, dstskip; - w = info->d_width * info->dst->BytesPerPixel; - h = info->d_height; - src = info->s_pixels; - dst = info->d_pixels; + w = info->dst_w * info->dst->BytesPerPixel; + h = info->dst_h; + src = info->src; + dst = info->dst; srcskip = w + info->s_skip; - dstskip = w + info->d_skip; + dstskip = w + info->dst_pitch; #ifdef __SSE__ if (SDL_HasSSE() && !((uintptr_t) src & 15) && !((uintptr_t) dst & 15)) { @@ -139,10 +139,10 @@ SDL_BlitCopyOverlap(SDL_BlitInfo * info) int w, h; int skip; - w = info->d_width * info->dst->BytesPerPixel; - h = info->d_height; - src = info->s_pixels; - dst = info->d_pixels; + w = info->dst_w * info->dst->BytesPerPixel; + h = info->dst_h; + src = info->src; + dst = info->dst; skip = w + info->s_skip; if ((dst < src) || (dst >= (src + h * skip))) { SDL_BlitCopy(info); diff --git a/src/video/SDL_rendercopy.h b/src/video/SDL_rendercopy.h deleted file mode 100644 index 85ae996cc..000000000 --- a/src/video/SDL_rendercopy.h +++ /dev/null @@ -1,138 +0,0 @@ -/* 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: */ diff --git a/src/video/SDL_renderer_sw.c b/src/video/SDL_renderer_sw.c index 4a9016abc..63fd4f40c 100644 --- a/src/video/SDL_renderer_sw.c +++ b/src/video/SDL_renderer_sw.c @@ -667,7 +667,8 @@ SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, if (texture->scaleMode) { copydata.flags |= SDL_RENDERCOPY_NEAREST; } - status = copyfunc(©data); + copyfunc(©data); + status = 0; } else { SDL_Rect real_srcrect = *srcrect; SDL_Rect real_dstrect; diff --git a/src/video/dummy/SDL_nullrender.c b/src/video/dummy/SDL_nullrender.c index 81219cf8f..d3462abdb 100644 --- a/src/video/dummy/SDL_nullrender.c +++ b/src/video/dummy/SDL_nullrender.c @@ -200,7 +200,8 @@ SDL_DUMMY_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, if (texture->scaleMode) { copydata.flags |= SDL_RENDERCOPY_NEAREST; } - return copyfunc(©data); + copyfunc(©data); + return 0; } else { SDL_Rect real_srcrect = *srcrect; SDL_Rect real_dstrect = *dstrect; diff --git a/src/video/sdlgenblit.pl b/src/video/sdlgenblit.pl index 01d617474..c291e9b2a 100755 --- a/src/video/sdlgenblit.pl +++ b/src/video/sdlgenblit.pl @@ -123,30 +123,7 @@ sub close_file { sub output_copydefs { print FILE <<__EOF__; -#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 { - 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); - +extern SDL_BlitFuncEntry *SDL_GeneratedBlitFuncTable; __EOF__ } @@ -161,7 +138,7 @@ sub output_copyfuncname my $args = shift; my $suffix = shift; - print FILE "$prefix SDL_RenderCopy_${src}_${dst}"; + print FILE "$prefix SDL_Blit_${src}_${dst}"; if ( $modulate ) { print FILE "_Modulate"; } @@ -172,7 +149,7 @@ sub output_copyfuncname print FILE "_Scale"; } if ( $args ) { - print FILE "(SDL_RenderCopyData *data)"; + print FILE "(SDL_BlitInfo *info)"; } print FILE "$suffix"; } @@ -225,7 +202,7 @@ sub output_copycore __EOF__ return; } - + if ( $blend ) { get_rgba("src", $src); get_rgba("dst", $dst); @@ -237,19 +214,19 @@ sub output_copycore if ( $modulate ) { print FILE <<__EOF__; - if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { + if (flags & SDL_COPY_MODULATE_COLOR) { ${s}R = (${s}R * modulateR) / 255; ${s}G = (${s}G * modulateG) / 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; } __EOF__ } if ( $blend ) { 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 */ if (${s}A < 255) { ${s}R = (${s}R * ${s}A) / 255; @@ -257,25 +234,25 @@ sub output_copycore ${s}B = (${s}B * ${s}A) / 255; } } - switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { - case SDL_RENDERCOPY_MASK: + switch (flags & (SDL_COPY_MASK|SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) { + case SDL_COPY_MASK: if (${s}A) { ${d}R = ${s}R; ${d}G = ${s}G; ${d}B = ${s}B; } break; - case SDL_RENDERCOPY_BLEND: + case SDL_COPY_BLEND: ${d}R = ${s}R + ((255 - ${s}A) * ${d}R) / 255; ${d}G = ${s}G + ((255 - ${s}A) * ${d}G) / 255; ${d}B = ${s}B + ((255 - ${s}A) * ${d}B) / 255; break; - case SDL_RENDERCOPY_ADD: + case SDL_COPY_ADD: ${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}B = ${s}B + ${d}B; if (${d}B > 255) ${d}B = 255; break; - case SDL_RENDERCOPY_MOD: + case SDL_COPY_MOD: ${d}R = (${s}R * ${d}R) / 255; ${d}G = (${s}G * ${d}G) / 255; ${d}B = (${s}B * ${d}B) / 255; @@ -298,17 +275,17 @@ sub output_copyfunc my $blend = 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__; { - const int flags = data->flags; + const int flags = info->flags; __EOF__ if ( $modulate ) { print FILE <<__EOF__; - const Uint32 modulateR = data->r; - const Uint32 modulateG = data->g; - const Uint32 modulateB = data->b; - const Uint32 modulateA = data->a; + const Uint32 modulateR = info->r; + const Uint32 modulateG = info->g; + const Uint32 modulateB = info->b; + const Uint32 modulateA = info->a; __EOF__ } if ( $blend ) { @@ -332,13 +309,13 @@ sub output_copyfunc srcy = 0; posy = 0; - incy = (data->src_h << 16) / data->dst_h; - incx = (data->src_w << 16) / data->dst_w; + incy = (info->src_h << 16) / info->dst_h; + incx = (info->src_w << 16) / info->dst_w; - while (data->dst_h--) { + while (info->dst_h--) { $format_type{$src} *src; - $format_type{$dst} *dst = ($format_type{$dst} *)data->dst; - int n = data->dst_w; + $format_type{$dst} *dst = ($format_type{$dst} *)info->dst; + int n = info->dst_w; srcx = -1; posx = 0x10000L; while (posy >= 0x10000L) { @@ -351,7 +328,7 @@ sub output_copyfunc ++srcx; 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__ print FILE <<__EOF__; } @@ -362,16 +339,16 @@ sub output_copyfunc ++dst; } posy += incy; - data->dst += data->dst_pitch; + info->dst += info->dst_pitch; } __EOF__ } else { print FILE <<__EOF__; - while (data->dst_h--) { - $format_type{$src} *src = ($format_type{$src} *)data->src; - $format_type{$dst} *dst = ($format_type{$dst} *)data->dst; - int n = data->dst_w; + while (info->dst_h--) { + $format_type{$src} *src = ($format_type{$src} *)info->src; + $format_type{$dst} *dst = ($format_type{$dst} *)info->dst; + int n = info->dst_w; while (n--) { __EOF__ output_copycore($src, $dst, $modulate, $blend); @@ -379,13 +356,12 @@ sub output_copyfunc ++src; ++dst; } - data->src += data->src_pitch; - data->dst += data->dst_pitch; + info->src += info->src_pitch; + info->dst += info->dst_pitch; } __EOF__ } print FILE <<__EOF__; - return 0; } __EOF__ @@ -393,24 +369,14 @@ sub output_copyfunc 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 { print FILE <<__EOF__; #include "SDL_video.h" -#include "SDL_rendercopy.h" +#include "SDL_blit.h" +#include "SDL_blit_auto.h" __EOF__ } @@ -418,14 +384,7 @@ sub output_copyinc sub output_copyfunctable { print FILE <<__EOF__; -static struct { - Uint32 src_format; - Uint32 dst_format; - int modMode; - int blendMode; - int scaleMode; - SDL_RenderCopyFunc func; -} SDL_RenderCopyFuncTable[] = { +static SDL_BlitFuncEntry _SDL_GeneratedBlitFuncTable[] = { __EOF__ for (my $i = 0; $i <= $#src_formats; ++$i) { my $src = $src_formats[$i]; @@ -436,21 +395,36 @@ sub output_copyfunctable for (my $scale = 0; $scale <= 1; ++$scale) { if ( $modulate || $blend || $scale ) { print FILE " { SDL_PIXELFORMAT_$src, SDL_PIXELFORMAT_$dst, "; + my $flags = ""; + my $flag = ""; if ( $modulate ) { - print FILE "(SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA), "; - } else { - print FILE "0, "; + $flag = "SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA"; + if ( $flags eq "" ) { + $flags = $flag; + } else { + $flags = "$flags | $flag"; + } } if ( $blend ) { - print FILE "(SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD | SDL_TEXTUREBLENDMODE_MOD), "; - } else { - print FILE "0, "; + $flag = "SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD"; + if ( $flags eq "" ) { + $flags = $flag; + } else { + $flags = "$flags | $flag"; + } } if ( $scale ) { - print FILE "SDL_TEXTURESCALEMODE_FAST, "; - } else { - print FILE "0, "; + $flag = "SDL_COPY_NEAREST"; + if ( $flags eq "" ) { + $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"); } } @@ -459,32 +433,10 @@ sub output_copyfunctable } } print FILE <<__EOF__; + { 0, 0, 0, 0, NULL } }; -SDL_RenderCopyFunc SDL_GetRenderCopyFunc(Uint32 src_format, Uint32 dst_format, int modMode, int blendMode, int scaleMode) -{ - 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; -} +SDL_BlitFuncEntry *SDL_GeneratedBlitFuncTable = _SDL_GeneratedBlitFuncTable; __EOF__ } @@ -505,7 +457,7 @@ sub output_copyfunc_c } } -open_file("SDL_rendercopy.h"); +open_file("SDL_blit_auto.h"); output_copydefs(); for (my $i = 0; $i <= $#src_formats; ++$i) { for (my $j = 0; $j <= $#dst_formats; ++$j) { @@ -513,9 +465,9 @@ sub output_copyfunc_c } } 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_copyfunctable(); for (my $i = 0; $i <= $#src_formats; ++$i) { @@ -523,4 +475,4 @@ sub output_copyfunc_c output_copyfunc_c($src_formats[$i], $dst_formats[$j]); } } -close_file("SDL_rendercopy.c"); +close_file("SDL_blit_auto.c");