Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Avoid some warnings on OS X with clang and update comment.

Browse Source
This commit is contained in:
Thomas Dinges
2015-10-25 20:48:28 +01:00
parent 72592cfbe0
commit aa49c16bd9
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/kernel_compat_cpu.h
View File

@@ -22,7 +22,7 @@
/* Release kernel has too much false-positive maybe-uninitialized warnings, /* Release kernel has too much false-positive maybe-uninitialized warnings,
* which makes it possible to miss actual 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 "-Wmaybe-uninitialized"
# pragma GCC diagnostic ignored "-Wuninitialized" # pragma GCC diagnostic ignored "-Wuninitialized"
#endif #endif

2
intern/cycles/kernel/osl/osl_services.cpp
View File

@@ -18,7 +18,7 @@
* here, so for now we just put here. In the future it might be better * here, so for now we just put here. In the future it might be better
* to have dedicated file for such tweaks. * 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 "-Wmaybe-uninitialized"
# pragma GCC diagnostic ignored "-Wuninitialized" # pragma GCC diagnostic ignored "-Wuninitialized"
#endif #endif

6
intern/cycles/util/util_optimization.h
View File

@@ -23,7 +23,9 @@
#if defined(__KERNEL_SSE2__) || \ #if defined(__KERNEL_SSE2__) || \
defined(__KERNEL_SSE3__) || \ defined(__KERNEL_SSE3__) || \
defined(__KERNEL_SSSE3__) || \ defined(__KERNEL_SSSE3__) || \
defined(__KERNEL_SSE41__) defined(__KERNEL_SSE41__) || \
defined(__KERNEL_AVX__) || \
defined(__KERNEL_AVX2__)
/* do nothing */ /* do nothing */
#endif #endif
@@ -45,7 +47,7 @@
/* x86-64 /* 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) #if defined(__x86_64__) || defined(_M_X64)