diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-11 14:57:44 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-11 14:57:44 +0300 |
| commit | 4bd1c1313ec2d08b843bb9e29c8668a781249548 (patch) | |
| tree | 552ab7e761a78dd26a04e25df7f9fe89fc525a52 /intern/cycles | |
| parent | ad5f50079ac126d104728b4a702717a7bac608c6 (diff) | |
| parent | 2d1e07268645b481dbbb924a5f638dc9fa870945 (diff) | |
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/util/util_system.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp index 6d6bee209b4..7206455debd 100644 --- a/intern/cycles/util/util_system.cpp +++ b/intern/cycles/util/util_system.cpp @@ -164,18 +164,13 @@ static CPUCapabilities& system_cpu_capabilities() static bool caps_init = false; if(!caps_init) { - int result[4], num; //, num_ex; + int result[4], num; memset(&caps, 0, sizeof(caps)); __cpuid(result, 0); num = result[0]; -#if 0 - __cpuid(result, 0x80000000); - num_ex = result[0]; -#endif - if(num >= 1) { __cpuid(result, 0x00000001); caps.mmx = (result[3] & ((int)1 << 23)) != 0; @@ -213,16 +208,6 @@ static CPUCapabilities& system_cpu_capabilities() caps.avx2 = (result[1] & ((int)1 << 5)) != 0; } -#if 0 - if(num_ex >= 0x80000001) { - __cpuid(result, 0x80000001); - caps.x64 = (result[3] & ((int)1 << 29)) != 0; - caps.sse4a = (result[2] & ((int)1 << 6)) != 0; - caps.fma4 = (result[2] & ((int)1 << 16)) != 0; - caps.xop = (result[2] & ((int)1 << 11)) != 0; - } -#endif - system_cpu_capabilities_override(&caps); caps_init = true; |