[Bf-blender-cvs] [b9f61eb874f] master: Cycles: Fix Architecture logging on x64.

Lazydodo noreply at git.blender.org
Mon Aug 26 15:22:51 CEST 2019


Commit: b9f61eb874f02bfddc42e5ce376fec7e71cb84b3
Author: Lazydodo
Date:   Mon Aug 26 07:22:44 2019 -0600
Branches: master
https://developer.blender.org/rBb9f61eb874f02bfddc42e5ce376fec7e71cb84b3

Cycles: Fix Architecture logging on x64.

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

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

M	intern/cycles/device/device_cpu.cpp

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

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index b2d923dfdf0..c2843a61e6d 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -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) {



More information about the Bf-blender-cvs mailing list