src/video/SDL_blit_N.c
changeset 1361 19418e4422cb
parent 1358 c71e05b4dc2e
child 1402 d910939febfa
     1.1 --- a/src/video/SDL_blit_N.c	Fri Feb 10 07:29:08 2006 +0000
     1.2 +++ b/src/video/SDL_blit_N.c	Thu Feb 16 10:11:48 2006 +0000
     1.3 @@ -27,7 +27,7 @@
     1.4  
     1.5  /* Functions to blit from N-bit surfaces to other surfaces */
     1.6  
     1.7 -#ifdef USE_ALTIVEC_BLITTERS
     1.8 +#if SDL_ALTIVEC_BLITTERS
     1.9  #ifdef HAVE_ALTIVEC_H
    1.10  #include <altivec.h>
    1.11  #endif
    1.12 @@ -842,7 +842,7 @@
    1.13  #define LO	1
    1.14  #endif
    1.15  
    1.16 -#ifdef USE_ASMBLIT
    1.17 +#if SDL_HERMES_BLITTERS
    1.18  
    1.19  /* Heheheh, we coerce Hermes into using SDL blit information */
    1.20  #define X86_ASSEMBLER
    1.21 @@ -850,8 +850,8 @@
    1.22  #define HermesClearInterface		void
    1.23  #define STACKCALL
    1.24  
    1.25 -#include "HeadMMX.h"
    1.26 -#include "HeadX86.h"
    1.27 +#include "../hermes/HeadMMX.h"
    1.28 +#include "../hermes/HeadX86.h"
    1.29  
    1.30  #else
    1.31  
    1.32 @@ -1200,7 +1200,7 @@
    1.33  #endif /* USE_DUFFS_LOOP */
    1.34  }
    1.35  
    1.36 -#endif /* USE_ASMBLIT */
    1.37 +#endif /* SDL_HERMES_BLITTERS */
    1.38  
    1.39  
    1.40  /* Special optimized blit for RGB 5-6-5 --> 32-bit RGB surfaces */
    1.41 @@ -2272,15 +2272,14 @@
    1.42  	{ 0,0,0, 0, 0,0,0, 0, NULL, NULL },
    1.43  };
    1.44  static const struct blit_table normal_blit_2[] = {
    1.45 -#ifdef USE_ASMBLIT
    1.46 +#if SDL_HERMES_BLITTERS
    1.47      { 0x0000F800,0x000007E0,0x0000001F, 2, 0x0000001F,0x000007E0,0x0000F800,
    1.48        0, ConvertX86p16_16BGR565, ConvertX86, NO_ALPHA },
    1.49      { 0x0000F800,0x000007E0,0x0000001F, 2, 0x00007C00,0x000003E0,0x0000001F,
    1.50        0, ConvertX86p16_16RGB555, ConvertX86, NO_ALPHA },
    1.51      { 0x0000F800,0x000007E0,0x0000001F, 2, 0x0000001F,0x000003E0,0x00007C00,
    1.52        0, ConvertX86p16_16BGR555, ConvertX86, NO_ALPHA },
    1.53 -#endif
    1.54 -#ifdef USE_ALTIVEC_BLITTERS
    1.55 +#elif SDL_ALTIVEC_BLITTERS
    1.56      /* has-altivec */
    1.57      { 0x0000F800,0x000007E0,0x0000001F, 4, 0x00000000,0x00000000,0x00000000,
    1.58        2, NULL, Blit_RGB565_32Altivec, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
    1.59 @@ -2304,7 +2303,7 @@
    1.60      { 0,0,0, 0, 0,0,0, 0, NULL, BlitNtoN, 0 }
    1.61  };
    1.62  static const struct blit_table normal_blit_4[] = {
    1.63 -#ifdef USE_ASMBLIT
    1.64 +#if SDL_HERMES_BLITTERS
    1.65      { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000F800,0x000007E0,0x0000001F,
    1.66        1, ConvertMMXpII32_16RGB565, ConvertMMX, NO_ALPHA },
    1.67      { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000F800,0x000007E0,0x0000001F,
    1.68 @@ -2332,7 +2331,7 @@
    1.69      { 0x00FF0000,0x0000FF00,0x000000FF, 4, 0x0000FF00,0x00FF0000,0xFF000000,
    1.70        0, ConvertX86p32_32BGRA888, ConvertX86, NO_ALPHA },
    1.71  #else
    1.72 -#ifdef USE_ALTIVEC_BLITTERS
    1.73 +#if SDL_ALTIVEC_BLITTERS
    1.74      /* has-altivec | dont-use-prefetch */
    1.75      { 0x00000000,0x00000000,0x00000000, 4, 0x00000000,0x00000000,0x00000000,
    1.76        6, NULL, ConvertAltivec32to32_noprefetch, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
    1.77 @@ -2393,7 +2392,7 @@
    1.78  	    else if(dstfmt->BytesPerPixel == 1)
    1.79  		return BlitNto1Key;
    1.80  	    else {
    1.81 -#ifdef USE_ALTIVEC_BLITTERS
    1.82 +#if SDL_ALTIVEC_BLITTERS
    1.83          if((srcfmt->BytesPerPixel == 4) && (dstfmt->BytesPerPixel == 4) && SDL_HasAltiVec()) {
    1.84              return Blit32to32KeyAltivec;
    1.85          } else
    1.86 @@ -2416,7 +2415,7 @@
    1.87  			if ( surface->map->table ) {
    1.88  				blitfun = Blit_RGB888_index8_map;
    1.89  			} else {
    1.90 -#ifdef USE_ASMBLIT
    1.91 +#if SDL_HERMES_BLITTERS
    1.92  				sdata->aux_data = ConvertX86p32_8RGB332;
    1.93  				blitfun = ConvertX86;
    1.94  #else
    1.95 @@ -2461,7 +2460,7 @@
    1.96  	}
    1.97  
    1.98  #ifdef DEBUG_ASM
    1.99 -#ifdef USE_ASMBLIT
   1.100 +#if SDL_HERMES_BLITTERS
   1.101  	if ( blitfun == ConvertMMX )
   1.102  		fprintf(stderr, "Using mmx blit\n");
   1.103  	else