Mercurial > sdl-ios-xcode

diff src/video/SDL_blit_0.c @ 2257:340942cfda48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved the colorkey and per-surface alpha into the blit info, in preparation for support for general color channel modulation. Removed and consolidated some data in the blit info.
author Sam Lantinga <slouken@libsdl.org>
date Fri, 17 Aug 2007 00:54:53 +0000
parents c121d94672cb
children bee005ace1bf
line wrap: on
line diff
--- a/src/video/SDL_blit_0.c	Thu Aug 16 22:56:18 2007 +0000
+++ b/src/video/SDL_blit_0.c	Fri Aug 17 00:54:53 2007 +0000
@@ -200,7 +200,7 @@
     Uint8 *dst = info->d_pixels;
     int srcskip = info->s_skip;
     int dstskip = info->d_skip;
-    Uint32 ckey = info->src->colorkey;
+    Uint32 ckey = info->ckey;
     Uint8 *palmap = info->table;
     int c;
 
@@ -253,7 +253,7 @@
     Uint16 *dstp = (Uint16 *) info->d_pixels;
     int srcskip = info->s_skip;
     int dstskip = info->d_skip;
-    Uint32 ckey = info->src->colorkey;
+    Uint32 ckey = info->ckey;
     Uint8 *palmap = info->table;
     int c;
 
@@ -288,7 +288,7 @@
     Uint8 *dst = info->d_pixels;
     int srcskip = info->s_skip;
     int dstskip = info->d_skip;
-    Uint32 ckey = info->src->colorkey;
+    Uint32 ckey = info->ckey;
     Uint8 *palmap = info->table;
     int c;
 
@@ -322,7 +322,7 @@
     Uint32 *dstp = (Uint32 *) info->d_pixels;
     int srcskip = info->s_skip;
     int dstskip = info->d_skip;
-    Uint32 ckey = info->src->colorkey;
+    Uint32 ckey = info->ckey;
     Uint8 *palmap = info->table;
     int c;
 
@@ -361,7 +361,7 @@
     SDL_PixelFormat *dstfmt = info->dst;
     int dstbpp;
     int c;
-    const int A = info->src->alpha;
+    const int A = (info->cmod >> 24);
 
     /* Set up some basic variables */
     dstbpp = dstfmt->BytesPerPixel;
@@ -407,8 +407,8 @@
     const SDL_Color *srcpal = srcfmt->palette->colors;
     int dstbpp;
     int c;
-    const int A = srcfmt->alpha;
-    Uint32 ckey = srcfmt->colorkey;
+    const int A = (info->cmod >> 24);
+    Uint32 ckey = info->ckey;
 
     /* Set up some basic variables */
     dstbpp = dstfmt->BytesPerPixel;