geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable MMX inline assembly on Clang for now. 

We should probably rewrite this with SSE compiler intrinsics or something
anyhow.
Ryan C. Gordon 2017-07-26 13:43:25 -04:00
parent 03eaddcad4
commit 7ecc48c3ba
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/render/SDL_yuv_mmx.c
View File

@ -20,7 +20,8 @@
*/ */
#include "../SDL_internal.h" #include "../SDL_internal.h"
#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES /* !!! FIXME: this broke on Clang (if it wasn't broken _before_) in https://hg.libsdl.org/SDL/rev/2ee7d2fa299b */
#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES && !defined(__clang__)
#include "SDL_stdinc.h" #include "SDL_stdinc.h"

9
src/render/SDL_yuv_sw.c
View File

@ -90,7 +90,12 @@
/* The colorspace conversion functions */ /* The colorspace conversion functions */
/* !!! FIXME: this broke on Clang (if it wasn't broken _before_) in https://hg.libsdl.org/SDL/rev/2ee7d2fa299b */
#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES #if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
#define USE_MMX_ASSEMBLY 1
#endif
#ifdef USE_MMX_ASSEMBLY
extern void Color565DitherYV12MMX1X(int *colortab, Uint32 * rgb_2_pix, extern void Color565DitherYV12MMX1X(int *colortab, Uint32 * rgb_2_pix,
unsigned char *lum, unsigned char *cr, unsigned char *lum, unsigned char *cr,
unsigned char *cb, unsigned char *out, unsigned char *cb, unsigned char *out,
@ -967,7 +972,7 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
case SDL_PIXELFORMAT_YV12: case SDL_PIXELFORMAT_YV12:
case SDL_PIXELFORMAT_IYUV: case SDL_PIXELFORMAT_IYUV:
if (SDL_BYTESPERPIXEL(target_format) == 2) { if (SDL_BYTESPERPIXEL(target_format) == 2) {
#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES #ifdef USE_MMX_ASSEMBLY
/* inline assembly functions */ /* inline assembly functions */
if (SDL_HasMMX() && (Rmask == 0xF800) && if (SDL_HasMMX() && (Rmask == 0xF800) &&
(Gmask == 0x07E0) && (Bmask == 0x001F) (Gmask == 0x07E0) && (Bmask == 0x001F)
@ -988,7 +993,7 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
swdata->Display2X = Color24DitherYV12Mod2X; swdata->Display2X = Color24DitherYV12Mod2X;
} }
if (SDL_BYTESPERPIXEL(target_format) == 4) { if (SDL_BYTESPERPIXEL(target_format) == 4) {
#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES #ifdef USE_MMX_ASSEMBLY
/* inline assembly functions */ /* inline assembly functions */
if (SDL_HasMMX() && (Rmask == 0x00FF0000) && if (SDL_HasMMX() && (Rmask == 0x00FF0000) &&
(Gmask == 0x0000FF00) && (Gmask == 0x0000FF00) &&