diff src/video/SDL_blit.h @ 2257:340942cfda48

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 292bee385630
children 202ddfd1cfb1
line wrap: on
line diff
--- a/src/video/SDL_blit.h	Thu Aug 16 22:56:18 2007 +0000
+++ b/src/video/SDL_blit.h	Fri Aug 17 00:54:53 2007 +0000
@@ -45,30 +45,25 @@
     int d_width;
     int d_height;
     int d_skip;
-    void *aux_data;
     SDL_PixelFormat *src;
     Uint8 *table;
     SDL_PixelFormat *dst;
+    Uint32 ckey, cmod;
 } SDL_BlitInfo;
 
 /* The type definition for the low level blit functions */
 typedef void (*SDL_loblit) (SDL_BlitInfo * info);
 
-/* This is the private info structure for software accelerated blits */
-struct private_swaccel
-{
-    SDL_loblit blit;
-    void *aux_data;
-};
-
 /* Blit mapping definition */
 typedef struct SDL_BlitMap
 {
     SDL_Surface *dst;
     int identity;
     Uint8 *table;
-    SDL_blit sw_blit;
-    struct private_swaccel *sw_data;
+    SDL_blit blit;
+    void *data;
+    Uint32 ckey;    /* colorkey */
+    Uint32 cmod;    /* ARGB modulation */
 
     /* the version count matches the destination; mismatch indicates
        an invalid mapping */