[Bf-blender-cvs] [f2951c2] master: Cleanup: Remove unused Cycles cpuid code.

Thomas Dinges noreply at git.blender.org
Wed Feb 11 11:29:34 CET 2015


Commit: f2951c23cf8d84bdb0964f53a93957f31c8b9f41
Author: Thomas Dinges
Date:   Wed Feb 11 11:28:42 2015 +0100
Branches: master
https://developer.blender.org/rBf2951c23cf8d84bdb0964f53a93957f31c8b9f41

Cleanup: Remove unused Cycles cpuid code.

===================================================================

M	intern/cycles/util/util_system.cpp

===================================================================

diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index 6d6bee2..7206455 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;




More information about the Bf-blender-cvs mailing list