Commit 6129de0d authored by Sam Lantinga's avatar Sam Lantinga

Fixed bug #220

The AltiVec blitters don't compile, since they require __VEC__ to be enabled in
order for the compiler to understand "vector" and friends (i.e. do AltiVec)
But you don't want to turn AltiVec on globally, since then the code would only
run on a G4 (there are already runtime tests, before using the AltiVec
variants)

The solution here is to enable AltiVec locally, for the actual AltiVec code.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401754
parent 3761c04c
...@@ -637,6 +637,9 @@ static void BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo *info) ...@@ -637,6 +637,9 @@ static void BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo *info)
#endif /* GCC_ASMBLIT, MSVC_ASMBLIT */ #endif /* GCC_ASMBLIT, MSVC_ASMBLIT */
#if SDL_ALTIVEC_BLITTERS #if SDL_ALTIVEC_BLITTERS
#if __MWERKS__
#pragma altivec_model on
#endif
#if HAVE_ALTIVEC_H #if HAVE_ALTIVEC_H
#include <altivec.h> #include <altivec.h>
#endif #endif
...@@ -1406,6 +1409,9 @@ static void BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo *info) ...@@ -1406,6 +1409,9 @@ static void BlitRGBtoRGBSurfaceAlphaAltivec(SDL_BlitInfo *info)
dstp += dstskip; dstp += dstskip;
} }
} }
#if __MWERKS__
#pragma altivec_model off
#endif
#endif /* SDL_ALTIVEC_BLITTERS */ #endif /* SDL_ALTIVEC_BLITTERS */
/* fast RGB888->(A)RGB888 blending with surface alpha=128 special case */ /* fast RGB888->(A)RGB888 blending with surface alpha=128 special case */
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
/* Functions to blit from N-bit surfaces to other surfaces */ /* Functions to blit from N-bit surfaces to other surfaces */
#if SDL_ALTIVEC_BLITTERS #if SDL_ALTIVEC_BLITTERS
#if __MWERKS__
#pragma altivec_model on
#endif
#ifdef HAVE_ALTIVEC_H #ifdef HAVE_ALTIVEC_H
#include <altivec.h> #include <altivec.h>
#endif #endif
...@@ -830,6 +833,9 @@ static Uint32 GetBlitFeatures( void ) ...@@ -830,6 +833,9 @@ static Uint32 GetBlitFeatures( void )
} }
return features; return features;
} }
#if __MWERKS__
#pragma altivec_model off
#endif
#else #else
/* Feature 1 is has-MMX */ /* Feature 1 is has-MMX */
#define GetBlitFeatures() ((Uint32)(SDL_HasMMX() ? 1 : 0)) #define GetBlitFeatures() ((Uint32)(SDL_HasMMX() ? 1 : 0))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment