diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
| commit | 1de316b38f589817344e1a342050de4c427501df (patch) | |
| tree | de3ec426a2a640a021b17ea55da8d71a07a8a412 /mesalib/src/gallium/auxiliary/util | |
| parent | 41665774749bc54dcd635ebbaab045a4350d5b2f (diff) | |
| parent | a7d3f63ee5e292379ed6d6eba0c65512205a4786 (diff) | |
| download | vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.gz vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.bz2 vcxsrv-1de316b38f589817344e1a342050de4c427501df.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 11 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_cpu_detect.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c b/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c index 2ff40bb00..d2d1313f8 100644 --- a/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c +++ b/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c @@ -283,8 +283,11 @@ static INLINE boolean sse2_has_daz(void) fxarea.mxcsr_mask = 0; #if (defined(PIPE_CC_GCC) || defined(PIPE_CC_SUNPRO)) __asm __volatile ("fxsave %0" : "+m" (fxarea)); -#elif (defined(PIPE_CC_MSVC) || defined(PIPE_CC_ICL)) +#elif (defined(PIPE_CC_MSVC) && _MSC_VER >= 1700) || defined(PIPE_CC_ICL) + /* 1700 = Visual Studio 2012 */ _fxsave(&fxarea); +#else + fxarea.mxcsr_mask = 0; #endif return !!(fxarea.mxcsr_mask & (1 << 6)); } |