Cycles: Fix Architecture logging on x64.
authorLazydodo <github@lazydodo.com>
Mon, 26 Aug 2019 13:22:44 +0000 (07:22 -0600)
committerLazydodo <github@lazydodo.com>
Mon, 26 Aug 2019 13:22:44 +0000 (07:22 -0600)
x64 builds with WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 not defined
since SSE2 is the lower bar for x64 cpus. Turning the architecture
logging related if into the last if in the architecture detection
chain, which will never execute unless you turn off all kernels
in de debug flags.

Reviewers: brecht

Differential Revision: https://developer.blender.org/D5579

intern/cycles/device/device_cpu.cpp

index b2d923dfdf005cbb487797714d7078b07c3abf4f..c2843a61e6d6e874eb5b91f07e87700586af4428 100644 (file)
@@ -114,6 +114,12 @@ template<typename F> class KernelFunctions {
       architecture_name = "SSE2";
       kernel = kernel_sse2;
     }
+#else
+    {
+      /* Dummy to prevent the architecture if below become
+       * conditional when WITH_CYCLES_OPTIMIZED_KERNEL_SSE2
+       * is not defined. */
+    }
 #endif
 
     if (strcmp(architecture_name, logged_architecture) != 0) {