From 039879876053083121c93dcf114f0ec55fc71de3 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 12 Aug 2007 15:41:36 +0000 Subject: [PATCH] Fixed compiling the Altivec blit code --- src/video/SDL_blit_A.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c index b5886f6f3..a5fad10e5 100644 --- a/src/video/SDL_blit_A.c +++ b/src/video/SDL_blit_A.c @@ -2838,8 +2838,7 @@ SDL_CalculateAlphaBlit(SDL_Surface * surface, int blit_index) else #if SDL_ALTIVEC_BLITTERS if (sf->BytesPerPixel == 4 && df->BytesPerPixel == 4 && - !(surface->map->dst->flags & SDL_HWSURFACE) - && SDL_HasAltiVec()) + SDL_HasAltiVec()) return Blit32to32SurfaceAlphaKeyAltivec; else #endif @@ -2882,17 +2881,14 @@ SDL_CalculateAlphaBlit(SDL_Surface * surface, int blit_index) #endif if ((sf->Rmask | sf->Gmask | sf->Bmask) == 0xffffff) { #if SDL_ALTIVEC_BLITTERS - if (!(surface->map->dst->flags & SDL_HWSURFACE) - && SDL_HasAltiVec()) + if (SDL_HasAltiVec()) return BlitRGBtoRGBSurfaceAlphaAltivec; #endif return BlitRGBtoRGBSurfaceAlpha; } } #if SDL_ALTIVEC_BLITTERS - if ((sf->BytesPerPixel == 4) && - !(surface->map->dst->flags & SDL_HWSURFACE) - && SDL_HasAltiVec()) + if ((sf->BytesPerPixel == 4) && SDL_HasAltiVec()) return Blit32to32SurfaceAlphaAltivec; else #endif @@ -2912,7 +2908,6 @@ SDL_CalculateAlphaBlit(SDL_Surface * surface, int blit_index) case 2: #if SDL_ALTIVEC_BLITTERS if (sf->BytesPerPixel == 4 - && !(surface->map->dst->flags & SDL_HWSURFACE) && df->Gmask == 0x7e0 && df->Bmask == 0x1f && SDL_HasAltiVec()) return Blit32to565PixelAlphaAltivec; @@ -2946,17 +2941,14 @@ SDL_CalculateAlphaBlit(SDL_Surface * surface, int blit_index) #endif if (sf->Amask == 0xff000000) { #if SDL_ALTIVEC_BLITTERS - if (!(surface->map->dst->flags & SDL_HWSURFACE) - && SDL_HasAltiVec()) + if (SDL_HasAltiVec()) return BlitRGBtoRGBPixelAlphaAltivec; #endif return BlitRGBtoRGBPixelAlpha; } } #if SDL_ALTIVEC_BLITTERS - if (sf->Amask && sf->BytesPerPixel == 4 && - !(surface->map->dst->flags & SDL_HWSURFACE) - && SDL_HasAltiVec()) + if (sf->Amask && sf->BytesPerPixel == 4 && SDL_HasAltiVec()) return Blit32to32PixelAlphaAltivec; else #endif