From b9f61eb874f02bfddc42e5ce376fec7e71cb84b3 Mon Sep 17 00:00:00 2001 From: Lazydodo Date: Mon, 26 Aug 2019 07:22:44 -0600 Subject: [PATCH] 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 --- intern/cycles/device/device_cpu.cpp | 6 ++++++ 1 file changed, 6 insertions(+) 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 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) {