diff src/video/SDL_blit_0.c @ 2262:bee005ace1bf

Work in progress: merging new texture features into SDL blit system
author Sam Lantinga <slouken@libsdl.org>
date Fri, 17 Aug 2007 06:21:58 +0000
parents 340942cfda48
children c785543d1843
line wrap: on
line diff
--- a/src/video/SDL_blit_0.c	Fri Aug 17 03:22:03 2007 +0000
+++ b/src/video/SDL_blit_0.c	Fri Aug 17 06:21:58 2007 +0000
@@ -35,12 +35,12 @@
     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 @@
     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 @@
     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 @@
     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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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;