aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-03-18 16:34:52 +0100
committermarha <marha@users.sourceforge.net>2013-03-18 16:34:52 +0100
commit1923199a967ec1add54ad8c0e5d48ee320efdb9f (patch)
treeb8c3af0c9f15576a65d85bb80f94546d7c0d0542 /mesalib/src/gallium/auxiliary/util/u_cpu_detect.c
parentb5acb643ab1a86b31409900a7c03281fcc48c8e3 (diff)
parent9c17f511266fff48a936633de280f271f0ce0c11 (diff)
downloadvcxsrv-1923199a967ec1add54ad8c0e5d48ee320efdb9f.tar.gz
vcxsrv-1923199a967ec1add54ad8c0e5d48ee320efdb9f.tar.bz2
vcxsrv-1923199a967ec1add54ad8c0e5d48ee320efdb9f.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libX11 mesa git update 18 Mar 2013 fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11 Mar 2013
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_cpu_detect.c')
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_cpu_detect.c2
1 files changed, 1 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 d7f0be40e..03280515b 100644
--- a/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c
+++ b/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c
@@ -270,7 +270,7 @@ util_cpu_detect(void)
util_cpu_caps.x86_cpu_type = 8 + ((regs2[0] >> 20) & 255); /* use extended family (P4, IA64) */
/* general feature flags */
- util_cpu_caps.has_tsc = (regs2[3] >> 8) & 1; /* 0x0000010 */
+ util_cpu_caps.has_tsc = (regs2[3] >> 4) & 1; /* 0x0000010 */
util_cpu_caps.has_mmx = (regs2[3] >> 23) & 1; /* 0x0800000 */
util_cpu_caps.has_sse = (regs2[3] >> 25) & 1; /* 0x2000000 */
util_cpu_caps.has_sse2 = (regs2[3] >> 26) & 1; /* 0x4000000 */