Commit 4d9ae375 authored by Sam Lantinga's avatar Sam Lantinga

indent

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402622
parent 8f8c8044
...@@ -82,7 +82,7 @@ SDL_SoftBlit(SDL_Surface * src, SDL_Rect * srcrect, ...@@ -82,7 +82,7 @@ SDL_SoftBlit(SDL_Surface * src, SDL_Rect * srcrect,
info.dst = dst->format; info.dst = dst->format;
info.ckey = src->map->ckey; info.ckey = src->map->ckey;
info.cmod = src->map->cmod; info.cmod = src->map->cmod;
RunBlit = (SDL_loblit)src->map->data; RunBlit = (SDL_loblit) src->map->data;
/* Run the actual software blit */ /* Run the actual software blit */
RunBlit(&info); RunBlit(&info);
......
...@@ -62,8 +62,8 @@ typedef struct SDL_BlitMap ...@@ -62,8 +62,8 @@ typedef struct SDL_BlitMap
Uint8 *table; Uint8 *table;
SDL_blit blit; SDL_blit blit;
void *data; void *data;
Uint32 ckey; /* colorkey */ Uint32 ckey; /* colorkey */
Uint32 cmod; /* ARGB modulation */ Uint32 cmod; /* ARGB modulation */
/* the version count matches the destination; mismatch indicates /* the version count matches the destination; mismatch indicates
an invalid mapping */ an invalid mapping */
......
...@@ -371,7 +371,7 @@ BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info) ...@@ -371,7 +371,7 @@ BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info)
__m64 src1, dst1, mm_alpha, mm_zero, dmask; __m64 src1, dst1, mm_alpha, mm_zero, dmask;
mm_zero = _mm_setzero_si64(); /* 0 -> mm_zero */ mm_zero = _mm_setzero_si64(); /* 0 -> mm_zero */
multmask = 0xFFFF; multmask = 0xFFFF;
multmask <<= (ashift * 2); multmask <<= (ashift * 2);
multmask = ~multmask; multmask = ~multmask;
dmask = *(__m64 *) & multmask; /* dst alpha mask -> dmask */ dmask = *(__m64 *) & multmask; /* dst alpha mask -> dmask */
...@@ -1389,7 +1389,7 @@ BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info) ...@@ -1389,7 +1389,7 @@ BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info)
__m64 src1, dst1, mm_alpha, mm_zero, dmask; __m64 src1, dst1, mm_alpha, mm_zero, dmask;
mm_zero = _mm_setzero_si64(); /* 0 -> mm_zero */ mm_zero = _mm_setzero_si64(); /* 0 -> mm_zero */
multmask = 0xFFFF; multmask = 0xFFFF;
multmask <<= (ashift * 2); multmask <<= (ashift * 2);
multmask = ~multmask; multmask = ~multmask;
dmask = *(__m64 *) & multmask; /* dst alpha mask -> dmask */ dmask = *(__m64 *) & multmask; /* dst alpha mask -> dmask */
...@@ -1874,7 +1874,7 @@ Blit565to565SurfaceAlpha(SDL_BlitInfo * info) ...@@ -1874,7 +1874,7 @@ Blit565to565SurfaceAlpha(SDL_BlitInfo * info)
static void static void
Blit555to555SurfaceAlpha(SDL_BlitInfo * info) Blit555to555SurfaceAlpha(SDL_BlitInfo * info)
{ {
unsigned alpha = (info->cmod >> 24); /* downscale alpha to 5 bits */ unsigned alpha = (info->cmod >> 24); /* downscale alpha to 5 bits */
if (alpha == 128) { if (alpha == 128) {
Blit16to16SurfaceAlpha128(info, 0xfbde); Blit16to16SurfaceAlpha128(info, 0xfbde);
} else { } else {
......
...@@ -673,7 +673,7 @@ Map1toN(SDL_PixelFormat * src, Uint32 cmod, SDL_PixelFormat * dst) ...@@ -673,7 +673,7 @@ Map1toN(SDL_PixelFormat * src, Uint32 cmod, SDL_PixelFormat * dst)
Uint8 *map; Uint8 *map;
int i; int i;
int bpp; int bpp;
unsigned Amod, Rmod, Gmod, Bmod; unsigned Amod, Rmod, Gmod, Bmod;
SDL_Palette *pal = src->palette; SDL_Palette *pal = src->palette;
bpp = ((dst->BytesPerPixel == 3) ? 4 : dst->BytesPerPixel); bpp = ((dst->BytesPerPixel == 3) ? 4 : dst->BytesPerPixel);
......
...@@ -286,7 +286,7 @@ SDL_SetAlpha(SDL_Surface * surface, Uint32 flag, Uint8 value) ...@@ -286,7 +286,7 @@ SDL_SetAlpha(SDL_Surface * surface, Uint32 flag, Uint8 value)
if (flag) { if (flag) {
surface->flags |= SDL_SRCALPHA; surface->flags |= SDL_SRCALPHA;
surface->map->cmod &= 0x00FFFFFF; surface->map->cmod &= 0x00FFFFFF;
surface->map->cmod |= ((Uint32)value << 24); surface->map->cmod |= ((Uint32) value << 24);
if (flag & SDL_RLEACCELOK) { if (flag & SDL_RLEACCELOK) {
surface->flags |= SDL_RLEACCELOK; surface->flags |= SDL_RLEACCELOK;
} else { } else {
...@@ -611,7 +611,7 @@ SDL_ConvertSurface(SDL_Surface * surface, ...@@ -611,7 +611,7 @@ SDL_ConvertSurface(SDL_Surface * surface,
if (format->Amask) { if (format->Amask) {
surface->flags &= ~SDL_SRCALPHA; surface->flags &= ~SDL_SRCALPHA;
} else { } else {
alpha = (Uint8)(surface->map->cmod >> 24); alpha = (Uint8) (surface->map->cmod >> 24);
SDL_SetAlpha(surface, 0, 0); SDL_SetAlpha(surface, 0, 0);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment