diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-29 20:50:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-29 20:50:12 +0200 |
| commit | aec798fb4dc72d616732d0fa711faffaa8cd7590 (patch) | |
| tree | 2814dfe69e7fb25b57492244d5cfa59d80fc8837 /mesalib/src/mesa/x86 | |
| parent | 78c6c2b88ae54977a2a617f116a1598657a98b6f (diff) | |
| parent | 816a5430313e07083c5325f0a430126a2e10ec41 (diff) | |
| download | vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.gz vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.bz2 vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'mesalib/src/mesa/x86')
| -rw-r--r-- | mesalib/src/mesa/x86/common_x86.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/x86/common_x86.c b/mesalib/src/mesa/x86/common_x86.c index 261f49170..b401c354a 100644 --- a/mesalib/src/mesa/x86/common_x86.c +++ b/mesalib/src/mesa/x86/common_x86.c @@ -52,6 +52,8 @@ #if !defined(bit_SSE4_1) && defined(bit_SSE41) /* XXX: clang defines bit_SSE41 instead of bit_SSE4_1 */ #define bit_SSE4_1 bit_SSE41 +#elif !defined(bit_SSE4_1) && !defined(bit_SSE41) +#define bit_SSE4_1 0x00080000 #endif #endif |