src/video/SDL_blit_A.c
changeset 2262 bee005ace1bf
parent 2261 c20476d7d7b3
child 2267 c785543d1843
     1.1 --- a/src/video/SDL_blit_A.c	Fri Aug 17 03:22:03 2007 +0000
     1.2 +++ b/src/video/SDL_blit_A.c	Fri Aug 17 06:21:58 2007 +0000
     1.3 @@ -30,12 +30,12 @@
     1.4  static void
     1.5  BlitNto1SurfaceAlpha(SDL_BlitInfo * info)
     1.6  {
     1.7 -    int width = info->d_width;
     1.8 -    int height = info->d_height;
     1.9 -    Uint8 *src = info->s_pixels;
    1.10 +    int width = info->dst_w;
    1.11 +    int height = info->dst_h;
    1.12 +    Uint8 *src = info->src;
    1.13      int srcskip = info->s_skip;
    1.14 -    Uint8 *dst = info->d_pixels;
    1.15 -    int dstskip = info->d_skip;
    1.16 +    Uint8 *dst = info->dst;
    1.17 +    int dstskip = info->dst_pitch;
    1.18      Uint8 *palmap = info->table;
    1.19      SDL_PixelFormat *srcfmt = info->src;
    1.20      SDL_PixelFormat *dstfmt = info->dst;
    1.21 @@ -86,12 +86,12 @@
    1.22  static void
    1.23  BlitNto1PixelAlpha(SDL_BlitInfo * info)
    1.24  {
    1.25 -    int width = info->d_width;
    1.26 -    int height = info->d_height;
    1.27 -    Uint8 *src = info->s_pixels;
    1.28 +    int width = info->dst_w;
    1.29 +    int height = info->dst_h;
    1.30 +    Uint8 *src = info->src;
    1.31      int srcskip = info->s_skip;
    1.32 -    Uint8 *dst = info->d_pixels;
    1.33 -    int dstskip = info->d_skip;
    1.34 +    Uint8 *dst = info->dst;
    1.35 +    int dstskip = info->dst_pitch;
    1.36      Uint8 *palmap = info->table;
    1.37      SDL_PixelFormat *srcfmt = info->src;
    1.38      SDL_PixelFormat *dstfmt = info->dst;
    1.39 @@ -142,12 +142,12 @@
    1.40  static void
    1.41  BlitNto1SurfaceAlphaKey(SDL_BlitInfo * info)
    1.42  {
    1.43 -    int width = info->d_width;
    1.44 -    int height = info->d_height;
    1.45 -    Uint8 *src = info->s_pixels;
    1.46 +    int width = info->dst_w;
    1.47 +    int height = info->dst_h;
    1.48 +    Uint8 *src = info->src;
    1.49      int srcskip = info->s_skip;
    1.50 -    Uint8 *dst = info->d_pixels;
    1.51 -    int dstskip = info->d_skip;
    1.52 +    Uint8 *dst = info->dst;
    1.53 +    int dstskip = info->dst_pitch;
    1.54      Uint8 *palmap = info->table;
    1.55      SDL_PixelFormat *srcfmt = info->src;
    1.56      SDL_PixelFormat *dstfmt = info->dst;
    1.57 @@ -203,12 +203,12 @@
    1.58  static void
    1.59  BlitRGBtoRGBSurfaceAlpha128MMX(SDL_BlitInfo * info)
    1.60  {
    1.61 -    int width = info->d_width;
    1.62 -    int height = info->d_height;
    1.63 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
    1.64 +    int width = info->dst_w;
    1.65 +    int height = info->dst_h;
    1.66 +    Uint32 *srcp = (Uint32 *) info->src;
    1.67      int srcskip = info->s_skip >> 2;
    1.68 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
    1.69 -    int dstskip = info->d_skip >> 2;
    1.70 +    Uint32 *dstp = (Uint32 *) info->dst;
    1.71 +    int dstskip = info->dst_pitch >> 2;
    1.72      Uint32 dalpha = info->dst->Amask;
    1.73  
    1.74      __m64 src1, src2, dst1, dst2, lmask, hmask, dsta;
    1.75 @@ -267,12 +267,12 @@
    1.76          /* only call a128 version when R,G,B occupy lower bits */
    1.77          BlitRGBtoRGBSurfaceAlpha128MMX(info);
    1.78      } else {
    1.79 -        int width = info->d_width;
    1.80 -        int height = info->d_height;
    1.81 -        Uint32 *srcp = (Uint32 *) info->s_pixels;
    1.82 +        int width = info->dst_w;
    1.83 +        int height = info->dst_h;
    1.84 +        Uint32 *srcp = (Uint32 *) info->src;
    1.85          int srcskip = info->s_skip >> 2;
    1.86 -        Uint32 *dstp = (Uint32 *) info->d_pixels;
    1.87 -        int dstskip = info->d_skip >> 2;
    1.88 +        Uint32 *dstp = (Uint32 *) info->dst;
    1.89 +        int dstskip = info->dst_pitch >> 2;
    1.90          Uint32 dalpha = df->Amask;
    1.91          Uint32 amult;
    1.92  
    1.93 @@ -356,12 +356,12 @@
    1.94  static void
    1.95  BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info)
    1.96  {
    1.97 -    int width = info->d_width;
    1.98 -    int height = info->d_height;
    1.99 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.100 +    int width = info->dst_w;
   1.101 +    int height = info->dst_h;
   1.102 +    Uint32 *srcp = (Uint32 *) info->src;
   1.103      int srcskip = info->s_skip >> 2;
   1.104 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.105 -    int dstskip = info->d_skip >> 2;
   1.106 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.107 +    int dstskip = info->dst_pitch >> 2;
   1.108      SDL_PixelFormat *sf = info->src;
   1.109      Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask;
   1.110      Uint32 amask = sf->Amask;
   1.111 @@ -542,11 +542,11 @@
   1.112  static void
   1.113  Blit32to565PixelAlphaAltivec(SDL_BlitInfo * info)
   1.114  {
   1.115 -    int height = info->d_height;
   1.116 -    Uint8 *src = (Uint8 *) info->s_pixels;
   1.117 +    int height = info->dst_h;
   1.118 +    Uint8 *src = (Uint8 *) info->src;
   1.119      int srcskip = info->s_skip;
   1.120 -    Uint8 *dst = (Uint8 *) info->d_pixels;
   1.121 -    int dstskip = info->d_skip;
   1.122 +    Uint8 *dst = (Uint8 *) info->dst;
   1.123 +    int dstskip = info->dst_pitch;
   1.124      SDL_PixelFormat *srcfmt = info->src;
   1.125  
   1.126      vector unsigned char v0 = vec_splat_u8(0);
   1.127 @@ -617,7 +617,7 @@
   1.128          vector unsigned char valigner;
   1.129          vector unsigned char vsrc;
   1.130          vector unsigned char voverflow;
   1.131 -        int width = info->d_width;
   1.132 +        int width = info->dst_w;
   1.133  
   1.134  #define ONE_PIXEL_BLEND(condition, widthvar) \
   1.135          while (condition) { \
   1.136 @@ -718,11 +718,11 @@
   1.137  static void
   1.138  Blit32to32SurfaceAlphaKeyAltivec(SDL_BlitInfo * info)
   1.139  {
   1.140 -    int height = info->d_height;
   1.141 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.142 +    int height = info->dst_h;
   1.143 +    Uint32 *srcp = (Uint32 *) info->src;
   1.144      int srcskip = info->s_skip >> 2;
   1.145 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.146 -    int dstskip = info->d_skip >> 2;
   1.147 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.148 +    int dstskip = info->dst_pitch >> 2;
   1.149      SDL_PixelFormat *srcfmt = info->src;
   1.150      SDL_PixelFormat *dstfmt = info->dst;
   1.151      unsigned sA = (info->cmod >> 24);
   1.152 @@ -766,7 +766,7 @@
   1.153      vrgbmask = vec_splat(vrgbmask, 0);
   1.154  
   1.155      while (height--) {
   1.156 -        int width = info->d_width;
   1.157 +        int width = info->dst_w;
   1.158  #define ONE_PIXEL_BLEND(condition, widthvar) \
   1.159          while (condition) { \
   1.160              Uint32 Pixel; \
   1.161 @@ -844,12 +844,12 @@
   1.162  static void
   1.163  Blit32to32PixelAlphaAltivec(SDL_BlitInfo * info)
   1.164  {
   1.165 -    int width = info->d_width;
   1.166 -    int height = info->d_height;
   1.167 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.168 +    int width = info->dst_w;
   1.169 +    int height = info->dst_h;
   1.170 +    Uint32 *srcp = (Uint32 *) info->src;
   1.171      int srcskip = info->s_skip >> 2;
   1.172 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.173 -    int dstskip = info->d_skip >> 2;
   1.174 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.175 +    int dstskip = info->dst_pitch >> 2;
   1.176      SDL_PixelFormat *srcfmt = info->src;
   1.177      SDL_PixelFormat *dstfmt = info->dst;
   1.178      vector unsigned char mergePermute;
   1.179 @@ -875,7 +875,7 @@
   1.180      vsdstPermute = calc_swizzle32(dstfmt, NULL);
   1.181  
   1.182      while (height--) {
   1.183 -        width = info->d_width;
   1.184 +        width = info->dst_w;
   1.185  #define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \
   1.186              Uint32 Pixel; \
   1.187              unsigned sR, sG, sB, dR, dG, dB, sA, dA; \
   1.188 @@ -942,12 +942,12 @@
   1.189  static void
   1.190  BlitRGBtoRGBPixelAlphaAltivec(SDL_BlitInfo * info)
   1.191  {
   1.192 -    int width = info->d_width;
   1.193 -    int height = info->d_height;
   1.194 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.195 +    int width = info->dst_w;
   1.196 +    int height = info->dst_h;
   1.197 +    Uint32 *srcp = (Uint32 *) info->src;
   1.198      int srcskip = info->s_skip >> 2;
   1.199 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.200 -    int dstskip = info->d_skip >> 2;
   1.201 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.202 +    int dstskip = info->dst_pitch >> 2;
   1.203      vector unsigned char mergePermute;
   1.204      vector unsigned char valphaPermute;
   1.205      vector unsigned char valphamask;
   1.206 @@ -965,7 +965,7 @@
   1.207  
   1.208      vpixelmask = vec_nor(valphamask, v0);
   1.209      while (height--) {
   1.210 -        width = info->d_width;
   1.211 +        width = info->dst_w;
   1.212  #define ONE_PIXEL_BLEND(condition, widthvar) \
   1.213          while ((condition)) { \
   1.214              Uint32 dalpha; \
   1.215 @@ -1040,11 +1040,11 @@
   1.216  Blit32to32SurfaceAlphaAltivec(SDL_BlitInfo * info)
   1.217  {
   1.218      /* XXX : 6 */
   1.219 -    int height = info->d_height;
   1.220 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.221 +    int height = info->dst_h;
   1.222 +    Uint32 *srcp = (Uint32 *) info->src;
   1.223      int srcskip = info->s_skip >> 2;
   1.224 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.225 -    int dstskip = info->d_skip >> 2;
   1.226 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.227 +    int dstskip = info->dst_pitch >> 2;
   1.228      SDL_PixelFormat *srcfmt = info->src;
   1.229      SDL_PixelFormat *dstfmt = info->dst;
   1.230      unsigned sA = (info->cmod >> 24);
   1.231 @@ -1076,7 +1076,7 @@
   1.232      vbits = (vector unsigned char) vec_splat_s8(-1);
   1.233  
   1.234      while (height--) {
   1.235 -        int width = info->d_width;
   1.236 +        int width = info->dst_w;
   1.237  #define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \
   1.238              Uint32 Pixel; \
   1.239              unsigned sR, sG, sB, dR, dG, dB; \
   1.240 @@ -1137,11 +1137,11 @@
   1.241  BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo * info)
   1.242  {
   1.243      unsigned alpha = (info->cmod >> 24);
   1.244 -    int height = info->d_height;
   1.245 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.246 +    int height = info->dst_h;
   1.247 +    Uint32 *srcp = (Uint32 *) info->src;
   1.248      int srcskip = info->s_skip >> 2;
   1.249 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.250 -    int dstskip = info->d_skip >> 2;
   1.251 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.252 +    int dstskip = info->dst_pitch >> 2;
   1.253      vector unsigned char mergePermute;
   1.254      vector unsigned char valpha;
   1.255      vector unsigned char valphamask;
   1.256 @@ -1160,7 +1160,7 @@
   1.257      valpha = vec_splat(valpha, 0);
   1.258  
   1.259      while (height--) {
   1.260 -        int width = info->d_width;
   1.261 +        int width = info->dst_w;
   1.262  #define ONE_PIXEL_BLEND(condition, widthvar) while ((condition)) { \
   1.263              Uint32 s = *srcp; \
   1.264              Uint32 d = *dstp; \
   1.265 @@ -1224,12 +1224,12 @@
   1.266  static void
   1.267  BlitRGBtoRGBSurfaceAlpha128(SDL_BlitInfo * info)
   1.268  {
   1.269 -    int width = info->d_width;
   1.270 -    int height = info->d_height;
   1.271 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.272 +    int width = info->dst_w;
   1.273 +    int height = info->dst_h;
   1.274 +    Uint32 *srcp = (Uint32 *) info->src;
   1.275      int srcskip = info->s_skip >> 2;
   1.276 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.277 -    int dstskip = info->d_skip >> 2;
   1.278 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.279 +    int dstskip = info->dst_pitch >> 2;
   1.280  
   1.281      while (height--) {
   1.282  	    /* *INDENT-OFF* */
   1.283 @@ -1253,12 +1253,12 @@
   1.284      if (alpha == 128) {
   1.285          BlitRGBtoRGBSurfaceAlpha128(info);
   1.286      } else {
   1.287 -        int width = info->d_width;
   1.288 -        int height = info->d_height;
   1.289 -        Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.290 +        int width = info->dst_w;
   1.291 +        int height = info->dst_h;
   1.292 +        Uint32 *srcp = (Uint32 *) info->src;
   1.293          int srcskip = info->s_skip >> 2;
   1.294 -        Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.295 -        int dstskip = info->d_skip >> 2;
   1.296 +        Uint32 *dstp = (Uint32 *) info->dst;
   1.297 +        int dstskip = info->dst_pitch >> 2;
   1.298          Uint32 s;
   1.299          Uint32 d;
   1.300          Uint32 s1;
   1.301 @@ -1321,12 +1321,12 @@
   1.302  static void
   1.303  BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * info)
   1.304  {
   1.305 -    int width = info->d_width;
   1.306 -    int height = info->d_height;
   1.307 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.308 +    int width = info->dst_w;
   1.309 +    int height = info->dst_h;
   1.310 +    Uint32 *srcp = (Uint32 *) info->src;
   1.311      int srcskip = info->s_skip >> 2;
   1.312 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.313 -    int dstskip = info->d_skip >> 2;
   1.314 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.315 +    int dstskip = info->dst_pitch >> 2;
   1.316  
   1.317      while (height--) {
   1.318  	    /* *INDENT-OFF* */
   1.319 @@ -1374,12 +1374,12 @@
   1.320  static void
   1.321  BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info)
   1.322  {
   1.323 -    int width = info->d_width;
   1.324 -    int height = info->d_height;
   1.325 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.326 +    int width = info->dst_w;
   1.327 +    int height = info->dst_h;
   1.328 +    Uint32 *srcp = (Uint32 *) info->src;
   1.329      int srcskip = info->s_skip >> 2;
   1.330 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.331 -    int dstskip = info->d_skip >> 2;
   1.332 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.333 +    int dstskip = info->dst_pitch >> 2;
   1.334      SDL_PixelFormat *sf = info->src;
   1.335      Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask;
   1.336      Uint32 amask = sf->Amask;
   1.337 @@ -1456,12 +1456,12 @@
   1.338  static void
   1.339  Blit16to16SurfaceAlpha128(SDL_BlitInfo * info, Uint16 mask)
   1.340  {
   1.341 -    int width = info->d_width;
   1.342 -    int height = info->d_height;
   1.343 -    Uint16 *srcp = (Uint16 *) info->s_pixels;
   1.344 +    int width = info->dst_w;
   1.345 +    int height = info->dst_h;
   1.346 +    Uint16 *srcp = (Uint16 *) info->src;
   1.347      int srcskip = info->s_skip >> 1;
   1.348 -    Uint16 *dstp = (Uint16 *) info->d_pixels;
   1.349 -    int dstskip = info->d_skip >> 1;
   1.350 +    Uint16 *dstp = (Uint16 *) info->dst;
   1.351 +    int dstskip = info->dst_pitch >> 1;
   1.352  
   1.353      while (height--) {
   1.354          if (((uintptr_t) srcp ^ (uintptr_t) dstp) & 2) {
   1.355 @@ -1562,12 +1562,12 @@
   1.356      if (alpha == 128) {
   1.357          Blit16to16SurfaceAlpha128(info, 0xf7de);
   1.358      } else {
   1.359 -        int width = info->d_width;
   1.360 -        int height = info->d_height;
   1.361 -        Uint16 *srcp = (Uint16 *) info->s_pixels;
   1.362 +        int width = info->dst_w;
   1.363 +        int height = info->dst_h;
   1.364 +        Uint16 *srcp = (Uint16 *) info->src;
   1.365          int srcskip = info->s_skip >> 1;
   1.366 -        Uint16 *dstp = (Uint16 *) info->d_pixels;
   1.367 -        int dstskip = info->d_skip >> 1;
   1.368 +        Uint16 *dstp = (Uint16 *) info->dst;
   1.369 +        int dstskip = info->dst_pitch >> 1;
   1.370          Uint32 s, d;
   1.371  
   1.372          __m64 src1, dst1, src2, dst2, gmask, bmask, mm_res, mm_alpha;
   1.373 @@ -1699,12 +1699,12 @@
   1.374      if (alpha == 128) {
   1.375          Blit16to16SurfaceAlpha128(info, 0xfbde);
   1.376      } else {
   1.377 -        int width = info->d_width;
   1.378 -        int height = info->d_height;
   1.379 -        Uint16 *srcp = (Uint16 *) info->s_pixels;
   1.380 +        int width = info->dst_w;
   1.381 +        int height = info->dst_h;
   1.382 +        Uint16 *srcp = (Uint16 *) info->src;
   1.383          int srcskip = info->s_skip >> 1;
   1.384 -        Uint16 *dstp = (Uint16 *) info->d_pixels;
   1.385 -        int dstskip = info->d_skip >> 1;
   1.386 +        Uint16 *dstp = (Uint16 *) info->dst;
   1.387 +        int dstskip = info->dst_pitch >> 1;
   1.388          Uint32 s, d;
   1.389  
   1.390          __m64 src1, dst1, src2, dst2, rmask, gmask, bmask, mm_res, mm_alpha;
   1.391 @@ -1839,12 +1839,12 @@
   1.392      if (alpha == 128) {
   1.393          Blit16to16SurfaceAlpha128(info, 0xf7de);
   1.394      } else {
   1.395 -        int width = info->d_width;
   1.396 -        int height = info->d_height;
   1.397 -        Uint16 *srcp = (Uint16 *) info->s_pixels;
   1.398 +        int width = info->dst_w;
   1.399 +        int height = info->dst_h;
   1.400 +        Uint16 *srcp = (Uint16 *) info->src;
   1.401          int srcskip = info->s_skip >> 1;
   1.402 -        Uint16 *dstp = (Uint16 *) info->d_pixels;
   1.403 -        int dstskip = info->d_skip >> 1;
   1.404 +        Uint16 *dstp = (Uint16 *) info->dst;
   1.405 +        int dstskip = info->dst_pitch >> 1;
   1.406          alpha >>= 3;            /* downscale alpha to 5 bits */
   1.407  
   1.408          while (height--) {
   1.409 @@ -1878,12 +1878,12 @@
   1.410      if (alpha == 128) {
   1.411          Blit16to16SurfaceAlpha128(info, 0xfbde);
   1.412      } else {
   1.413 -        int width = info->d_width;
   1.414 -        int height = info->d_height;
   1.415 -        Uint16 *srcp = (Uint16 *) info->s_pixels;
   1.416 +        int width = info->dst_w;
   1.417 +        int height = info->dst_h;
   1.418 +        Uint16 *srcp = (Uint16 *) info->src;
   1.419          int srcskip = info->s_skip >> 1;
   1.420 -        Uint16 *dstp = (Uint16 *) info->d_pixels;
   1.421 -        int dstskip = info->d_skip >> 1;
   1.422 +        Uint16 *dstp = (Uint16 *) info->dst;
   1.423 +        int dstskip = info->dst_pitch >> 1;
   1.424          alpha >>= 3;            /* downscale alpha to 5 bits */
   1.425  
   1.426          while (height--) {
   1.427 @@ -1913,12 +1913,12 @@
   1.428  static void
   1.429  BlitARGBto565PixelAlpha(SDL_BlitInfo * info)
   1.430  {
   1.431 -    int width = info->d_width;
   1.432 -    int height = info->d_height;
   1.433 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.434 +    int width = info->dst_w;
   1.435 +    int height = info->dst_h;
   1.436 +    Uint32 *srcp = (Uint32 *) info->src;
   1.437      int srcskip = info->s_skip >> 2;
   1.438 -    Uint16 *dstp = (Uint16 *) info->d_pixels;
   1.439 -    int dstskip = info->d_skip >> 1;
   1.440 +    Uint16 *dstp = (Uint16 *) info->dst;
   1.441 +    int dstskip = info->dst_pitch >> 1;
   1.442  
   1.443      while (height--) {
   1.444  	    /* *INDENT-OFF* */
   1.445 @@ -1959,12 +1959,12 @@
   1.446  static void
   1.447  BlitARGBto555PixelAlpha(SDL_BlitInfo * info)
   1.448  {
   1.449 -    int width = info->d_width;
   1.450 -    int height = info->d_height;
   1.451 -    Uint32 *srcp = (Uint32 *) info->s_pixels;
   1.452 +    int width = info->dst_w;
   1.453 +    int height = info->dst_h;
   1.454 +    Uint32 *srcp = (Uint32 *) info->src;
   1.455      int srcskip = info->s_skip >> 2;
   1.456 -    Uint16 *dstp = (Uint16 *) info->d_pixels;
   1.457 -    int dstskip = info->d_skip >> 1;
   1.458 +    Uint16 *dstp = (Uint16 *) info->dst;
   1.459 +    int dstskip = info->dst_pitch >> 1;
   1.460  
   1.461      while (height--) {
   1.462  	    /* *INDENT-OFF* */
   1.463 @@ -2006,12 +2006,12 @@
   1.464  static void
   1.465  BlitNtoNSurfaceAlpha(SDL_BlitInfo * info)
   1.466  {
   1.467 -    int width = info->d_width;
   1.468 -    int height = info->d_height;
   1.469 -    Uint8 *src = info->s_pixels;
   1.470 +    int width = info->dst_w;
   1.471 +    int height = info->dst_h;
   1.472 +    Uint8 *src = info->src;
   1.473      int srcskip = info->s_skip;
   1.474 -    Uint8 *dst = info->d_pixels;
   1.475 -    int dstskip = info->d_skip;
   1.476 +    Uint8 *dst = info->dst;
   1.477 +    int dstskip = info->dst_pitch;
   1.478      SDL_PixelFormat *srcfmt = info->src;
   1.479      SDL_PixelFormat *dstfmt = info->dst;
   1.480      int srcbpp = srcfmt->BytesPerPixel;
   1.481 @@ -2050,12 +2050,12 @@
   1.482  static void
   1.483  BlitNtoNSurfaceAlphaKey(SDL_BlitInfo * info)
   1.484  {
   1.485 -    int width = info->d_width;
   1.486 -    int height = info->d_height;
   1.487 -    Uint8 *src = info->s_pixels;
   1.488 +    int width = info->dst_w;
   1.489 +    int height = info->dst_h;
   1.490 +    Uint8 *src = info->src;
   1.491      int srcskip = info->s_skip;
   1.492 -    Uint8 *dst = info->d_pixels;
   1.493 -    int dstskip = info->d_skip;
   1.494 +    Uint8 *dst = info->dst;
   1.495 +    int dstskip = info->dst_pitch;
   1.496      SDL_PixelFormat *srcfmt = info->src;
   1.497      SDL_PixelFormat *dstfmt = info->dst;
   1.498      Uint32 ckey = info->ckey;
   1.499 @@ -2096,12 +2096,12 @@
   1.500  static void
   1.501  BlitNtoNPixelAlpha(SDL_BlitInfo * info)
   1.502  {
   1.503 -    int width = info->d_width;
   1.504 -    int height = info->d_height;
   1.505 -    Uint8 *src = info->s_pixels;
   1.506 +    int width = info->dst_w;
   1.507 +    int height = info->dst_h;
   1.508 +    Uint8 *src = info->src;
   1.509      int srcskip = info->s_skip;
   1.510 -    Uint8 *dst = info->d_pixels;
   1.511 -    int dstskip = info->d_skip;
   1.512 +    Uint8 *dst = info->dst;
   1.513 +    int dstskip = info->dst_pitch;
   1.514      SDL_PixelFormat *srcfmt = info->src;
   1.515      SDL_PixelFormat *dstfmt = info->dst;
   1.516