diff options
| author | Thomas Dinges <blender@dingto.org> | 2015-10-25 22:48:28 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2015-10-26 13:52:24 +0300 |
| commit | aa49c16bd94f0ef38edcc1e24e90717799354445 (patch) | |
| tree | 594fae3359426edbd185f4c987f1c8a4117c5026 /intern | |
| parent | 72592cfbe0ea8dc6af3d17c5ea4126121b997a70 (diff) | |
Cleanup: Avoid some warnings on OS X with clang and update comment.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_cpu.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_optimization.h | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h index 04c4cf35587..baa67f63ab3 100644 --- a/intern/cycles/kernel/kernel_compat_cpu.h +++ b/intern/cycles/kernel/kernel_compat_cpu.h @@ -22,7 +22,7 @@ /* Release kernel has too much false-positive maybe-uninitialized warnings, * which makes it possible to miss actual warnings. */ -#if defined(__GNUC__) && defined(NDEBUG) +#if (defined(__GNUC__) && !defined(__clang__)) && defined(NDEBUG) # pragma GCC diagnostic ignored "-Wmaybe-uninitialized" # pragma GCC diagnostic ignored "-Wuninitialized" #endif diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 3c1955a1e1e..b0609ad1da9 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -18,7 +18,7 @@ * here, so for now we just put here. In the future it might be better * to have dedicated file for such tweaks. */ -#if defined(__GNUC__) && defined(NDEBUG) +#if (defined(__GNUC__) && !defined(__clang__)) && defined(NDEBUG) # pragma GCC diagnostic ignored "-Wmaybe-uninitialized" # pragma GCC diagnostic ignored "-Wuninitialized" #endif diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/util_optimization.h index 42d3ca69b3a..b1f9ee6af69 100644 --- a/intern/cycles/util/util_optimization.h +++ b/intern/cycles/util/util_optimization.h @@ -23,7 +23,9 @@ #if defined(__KERNEL_SSE2__) || \ defined(__KERNEL_SSE3__) || \ defined(__KERNEL_SSSE3__) || \ - defined(__KERNEL_SSE41__) + defined(__KERNEL_SSE41__) || \ + defined(__KERNEL_AVX__) || \ + defined(__KERNEL_AVX2__) /* do nothing */ #endif @@ -45,7 +47,7 @@ /* x86-64 * - * Compile a regular (includes SSE2), SSE3 and SSE 4.1 kernel. */ + * Compile a regular (includes SSE2), SSE3, SSE 4.1, AVX and AVX2 kernel. */ #if defined(__x86_64__) || defined(_M_X64) |