[Bf-blender-cvs] [4d0fc5de3a9] temp-cycles-denoising: Cycles Denoising: CPUDevice tweaks from the review

[Lukas Stockner]

Commit: 4d0fc5de3a976ce5c201a7b278e8a392f96316a8
Author: Lukas Stockner
Date:   Thu Apr 13 05:03:13 2017 +0200
Branches: temp-cycles-denoising
https://developer.blender.org/rB4d0fc5de3a976ce5c201a7b278e8a392f96316a8

Cycles Denoising: CPUDevice tweaks from the review

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

M	intern/cycles/device/device_cpu.cpp

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

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 12f95f65af0..d75a8c6152e 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -57,7 +57,7 @@ CCL_NAMESPACE_BEGIN
 class CPUDevice;
 
 /* Has to be outside of the class to be shared across template instantiations. */
-static bool logged_architecture = false;
+static const char *logged_architecture = "";
 
 template<typename F>
 class KernelFunctions {
@@ -74,7 +74,7 @@ public:
 	                F kernel_avx,
 	                F kernel_avx2)
 	{
-		string architecture_name = "default";
+		const char *architecture_name = "default";
 		kernel = kernel_default;
 
 		/* Silence potential warnings about unused variables
@@ -119,9 +119,9 @@ public:
 		}
 #endif
 
-		if(!logged_architecture) {
+		if(strstr(architecture_name, logged_architecture) != 0) {
 			VLOG(1) << "Will be using " << architecture_name << " kernels.";
-			logged_architecture = true;
+			logged_architecture = architecture_name;
 		}
 	}
 
@@ -676,6 +676,7 @@ public:
 				thread_kernel_globals_free((KernelGlobals*)kgbuffer.device_pointer);
 				mem_free(kgbuffer);
 
+				delete split_kernel;
 				return;
 			}
 		}