gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Group the blit copy flags to simplify code

Browse Source
This commit is contained in:
Sam Lantinga
2024-08-01 11:24:54 -07:00
parent 7d27a97402
commit 15f68a86ff
6 changed files with 251 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/SDL_blit.c
View File

@@ -125,7 +125,7 @@ static SDL_bool SDL_UseAltivecPrefetch(void)
static SDL_BlitFunc SDL_ChooseBlitFunc(SDL_PixelFormat src_format, SDL_PixelFormat dst_format, int flags, static SDL_BlitFunc SDL_ChooseBlitFunc(SDL_PixelFormat src_format, SDL_PixelFormat dst_format, int flags,
SDL_BlitFuncEntry *entries) SDL_BlitFuncEntry *entries)
{ {
int i, flagcheck = (flags & (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_BLEND_PREMULTIPLIED | SDL_COPY_ADD | SDL_COPY_ADD_PREMULTIPLIED | SDL_COPY_MOD | SDL_COPY_MUL | SDL_COPY_COLORKEY | SDL_COPY_NEAREST)); int i, flagcheck = (flags & (SDL_COPY_MODULATE_MASK | SDL_COPY_BLEND_MASK | SDL_COPY_COLORKEY | SDL_COPY_NEAREST));
static unsigned int features = 0x7fffffff; static unsigned int features = 0x7fffffff;
/* Get the available CPU features */ /* Get the available CPU features */

2
src/video/SDL_blit.h
View File

@@ -30,12 +30,14 @@ extern const Uint16 SDL_expand_byte_10[];
/* SDL blit copy flags */ /* SDL blit copy flags */
#define SDL_COPY_MODULATE_COLOR 0x00000001 #define SDL_COPY_MODULATE_COLOR 0x00000001
#define SDL_COPY_MODULATE_ALPHA 0x00000002 #define SDL_COPY_MODULATE_ALPHA 0x00000002
#define SDL_COPY_MODULATE_MASK (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA)
#define SDL_COPY_BLEND 0x00000010 #define SDL_COPY_BLEND 0x00000010
#define SDL_COPY_BLEND_PREMULTIPLIED 0x00000020 #define SDL_COPY_BLEND_PREMULTIPLIED 0x00000020
#define SDL_COPY_ADD 0x00000040 #define SDL_COPY_ADD 0x00000040
#define SDL_COPY_ADD_PREMULTIPLIED 0x00000080 #define SDL_COPY_ADD_PREMULTIPLIED 0x00000080
#define SDL_COPY_MOD 0x00000100 #define SDL_COPY_MOD 0x00000100
#define SDL_COPY_MUL 0x00000200 #define SDL_COPY_MUL 0x00000200
#define SDL_COPY_BLEND_MASK (SDL_COPY_BLEND | SDL_COPY_BLEND_PREMULTIPLIED | SDL_COPY_ADD | SDL_COPY_ADD_PREMULTIPLIED | SDL_COPY_MOD | SDL_COPY_MUL)
#define SDL_COPY_COLORKEY 0x00000400 #define SDL_COPY_COLORKEY 0x00000400
#define SDL_COPY_NEAREST 0x00000800 #define SDL_COPY_NEAREST 0x00000800
#define SDL_COPY_RLE_DESIRED 0x00001000 #define SDL_COPY_RLE_DESIRED 0x00001000

480
src/video/SDL_blit_auto.c
View File

File diff suppressed because it is too large Load Diff

4
src/video/SDL_blit_slow.c
View File

@@ -146,7 +146,7 @@ void SDL_Blit_Slow(SDL_BlitInfo *info)
continue; continue;
} }
} }
if ((flags & (SDL_COPY_BLEND | SDL_COPY_BLEND_PREMULTIPLIED | SDL_COPY_ADD | SDL_COPY_ADD_PREMULTIPLIED | SDL_COPY_MOD | SDL_COPY_MUL))) { if (flags & SDL_COPY_BLEND_MASK) {
switch (dst_access) { switch (dst_access) {
case SlowBlitPixelAccess_Index8: case SlowBlitPixelAccess_Index8:
dstpixel = *dst; dstpixel = *dst;
@@ -206,7 +206,7 @@ void SDL_Blit_Slow(SDL_BlitInfo *info)
srcB = (srcB * srcA) / 255; srcB = (srcB * srcA) / 255;
} }
} }
switch (flags & (SDL_COPY_BLEND | SDL_COPY_BLEND_PREMULTIPLIED | SDL_COPY_ADD | SDL_COPY_ADD_PREMULTIPLIED | SDL_COPY_MOD | SDL_COPY_MUL)) { switch (flags & SDL_COPY_BLEND_MASK) {
case 0: case 0:
dstR = srcR; dstR = srcR;
dstG = srcG; dstG = srcG;

8
src/video/SDL_surface.c
View File

@@ -722,7 +722,7 @@ int SDL_SetSurfaceBlendMode(SDL_Surface *surface, SDL_BlendMode blendMode)
status = 0; status = 0;
flags = surface->internal->map.info.flags; flags = surface->internal->map.info.flags;
surface->internal->map.info.flags &= ~(SDL_COPY_BLEND | SDL_COPY_BLEND_PREMULTIPLIED | SDL_COPY_ADD | SDL_COPY_ADD_PREMULTIPLIED | SDL_COPY_MOD | SDL_COPY_MUL); surface->internal->map.info.flags &= ~SDL_COPY_BLEND_MASK;
switch (blendMode) { switch (blendMode) {
case SDL_BLENDMODE_NONE: case SDL_BLENDMODE_NONE:
break; break;
@@ -770,7 +770,7 @@ int SDL_GetSurfaceBlendMode(SDL_Surface *surface, SDL_BlendMode *blendMode)
return 0; return 0;
} }
switch (surface->internal->map.info.flags & (SDL_COPY_BLEND | SDL_COPY_BLEND_PREMULTIPLIED | SDL_COPY_ADD | SDL_COPY_ADD_PREMULTIPLIED | SDL_COPY_MOD | SDL_COPY_MUL)) { switch (surface->internal->map.info.flags & SDL_COPY_BLEND_MASK) {
case SDL_COPY_BLEND: case SDL_COPY_BLEND:
*blendMode = SDL_BLENDMODE_BLEND; *blendMode = SDL_BLENDMODE_BLEND;
break; break;
@@ -1103,9 +1103,7 @@ int SDL_BlitSurfaceUncheckedScaled(SDL_Surface *src, const SDL_Rect *srcrect,
SDL_Surface *dst, const SDL_Rect *dstrect, SDL_Surface *dst, const SDL_Rect *dstrect,
SDL_ScaleMode scaleMode) SDL_ScaleMode scaleMode)
{ {
static const Uint32 complex_copy_flags = (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | static const Uint32 complex_copy_flags = (SDL_COPY_MODULATE_MASK | SDL_COPY_BLEND_MASK | SDL_COPY_COLORKEY);
SDL_COPY_BLEND | SDL_COPY_BLEND_PREMULTIPLIED | SDL_COPY_ADD | SDL_COPY_ADD_PREMULTIPLIED | SDL_COPY_MOD | SDL_COPY_MUL |
SDL_COPY_COLORKEY);
if (srcrect->w > SDL_MAX_UINT16 || srcrect->h > SDL_MAX_UINT16 || if (srcrect->w > SDL_MAX_UINT16 || srcrect->h > SDL_MAX_UINT16 ||
dstrect->w > SDL_MAX_UINT16 || dstrect->h > SDL_MAX_UINT16) { dstrect->w > SDL_MAX_UINT16 || dstrect->h > SDL_MAX_UINT16) {

6
src/video/sdlgenblit.pl
View File

@@ -337,7 +337,7 @@ __EOF__
__EOF__ __EOF__
} }
print FILE <<__EOF__; print FILE <<__EOF__;
switch (flags & (SDL_COPY_BLEND | SDL_COPY_BLEND_PREMULTIPLIED | SDL_COPY_ADD | SDL_COPY_ADD_PREMULTIPLIED | SDL_COPY_MOD | SDL_COPY_MUL)) { switch (flags & SDL_COPY_BLEND_MASK) {
case SDL_COPY_BLEND: case SDL_COPY_BLEND:
__EOF__ __EOF__
if ($A_is_const_FF) { if ($A_is_const_FF) {
@@ -658,7 +658,7 @@ __EOF__
my $flags = ""; my $flags = "";
my $flag = ""; my $flag = "";
if ( $modulate ) { if ( $modulate ) {
$flag = "SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA"; $flag = "SDL_COPY_MODULATE_MASK";
if ( $flags eq "" ) { if ( $flags eq "" ) {
$flags = $flag; $flags = $flag;
} else { } else {
@@ -666,7 +666,7 @@ __EOF__
} }
} }
if ( $blend ) { if ( $blend ) {
$flag = "SDL_COPY_BLEND | SDL_COPY_BLEND_PREMULTIPLIED | SDL_COPY_ADD | SDL_COPY_ADD_PREMULTIPLIED | SDL_COPY_MOD | SDL_COPY_MUL"; $flag = "SDL_COPY_BLEND_MASK";
if ( $flags eq "" ) { if ( $flags eq "" ) {
$flags = $flag; $flags = $flag;
} else { } else {