From 31a58a8e2b05e868680972a36d91a243dadccf44 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 14 Jul 2007 07:26:34 +0000 Subject: [PATCH] Mac OS X/x86 won't build the MMX/YUV inline assembly without optimizations enabled (not enough registers), so for now, we only build it if we see the __OPTIMIZE__ #define, which GCC provides when you build at -O1 or higher. --- src/video/SDL_yuv_mmx.c | 2 +- src/video/SDL_yuv_sw.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video/SDL_yuv_mmx.c b/src/video/SDL_yuv_mmx.c index 12deba4a5..059dd50c4 100644 --- a/src/video/SDL_yuv_mmx.c +++ b/src/video/SDL_yuv_mmx.c @@ -21,7 +21,7 @@ */ #include "SDL_config.h" -#if (__GNUC__ > 2) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES +#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES #include "SDL_stdinc.h" diff --git a/src/video/SDL_yuv_sw.c b/src/video/SDL_yuv_sw.c index 66c2bb7dc..13c4a92e1 100644 --- a/src/video/SDL_yuv_sw.c +++ b/src/video/SDL_yuv_sw.c @@ -121,7 +121,7 @@ struct private_yuvhwdata { /* The colorspace conversion functions */ -#if (__GNUC__ > 2) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES +#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES extern void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix, unsigned char *lum, unsigned char *cr, unsigned char *cb, unsigned char *out, @@ -1061,7 +1061,7 @@ SDL_Overlay *SDL_CreateYUV_SW(_THIS, int width, int height, Uint32 format, SDL_S case SDL_YV12_OVERLAY: case SDL_IYUV_OVERLAY: if ( display->format->BytesPerPixel == 2 ) { -#if (__GNUC__ > 2) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES +#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES /* inline assembly functions */ if ( SDL_HasMMX() && (Rmask == 0xF800) && (Gmask == 0x07E0) && @@ -1083,7 +1083,7 @@ SDL_Overlay *SDL_CreateYUV_SW(_THIS, int width, int height, Uint32 format, SDL_S swdata->Display2X = Color24DitherYV12Mod2X; } if ( display->format->BytesPerPixel == 4 ) { -#if (__GNUC__ > 2) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES +#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES /* inline assembly functions */ if ( SDL_HasMMX() && (Rmask == 0x00FF0000) && (Gmask == 0x0000FF00) &&