diff options
| author | Lazydodo <github@lazydodo.com> | 2019-08-26 16:22:44 +0300 |
|---|---|---|
| committer | Lazydodo <github@lazydodo.com> | 2019-08-26 16:22:44 +0300 |
| commit | b9f61eb874f02bfddc42e5ce376fec7e71cb84b3 (patch) | |
| tree | 775f5f3d5fd1b337a2086f37ac2f15c759738195 | |
| parent | 16c1b10ed240b930b29f81ae5970a174808f53d7 (diff) | |
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
| -rw-r--r-- | intern/cycles/device/device_cpu.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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) { |