forked from bartvdbraak/blender
add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment.
also some cmake formatting edits.
This commit is contained in:
parent
2ca9a6a004
commit
85a97f64a7
2
extern/CMakeLists.txt
vendored
2
extern/CMakeLists.txt
vendored
@ -45,7 +45,7 @@ if(WITH_BUILTIN_GLEW)
|
||||
endif()
|
||||
|
||||
if(WITH_GAMEENGINE)
|
||||
add_subdirectory(recastnavigation)
|
||||
add_subdirectory(recastnavigation)
|
||||
endif()
|
||||
|
||||
if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
|
||||
|
@ -36,19 +36,19 @@ if(WITH_CYCLES_OPTIMIZED_KERNEL)
|
||||
endif()
|
||||
|
||||
if(WITH_CYCLES_NETWORK)
|
||||
add_definitions(-DWITH_NETWORK)
|
||||
add_definitions(-DWITH_NETWORK)
|
||||
endif()
|
||||
|
||||
if(WITH_CYCLES_OSL)
|
||||
add_definitions(-DWITH_OSL)
|
||||
add_definitions(-DWITH_OSL)
|
||||
endif()
|
||||
|
||||
if(WITH_CYCLES_PARTIO)
|
||||
add_definitions(-DWITH_PARTIO)
|
||||
add_definitions(-DWITH_PARTIO)
|
||||
endif()
|
||||
|
||||
if(WITH_CYCLES_CUDA_BINARIES)
|
||||
add_definitions(-DWITH_CUDA_BINARIES)
|
||||
add_definitions(-DWITH_CUDA_BINARIES)
|
||||
endif()
|
||||
|
||||
add_definitions(-DWITH_OPENCL)
|
||||
|
@ -300,4 +300,13 @@
|
||||
# define BLI_assert(a) (void)0
|
||||
#endif
|
||||
|
||||
/* hints for branch pradiction, only use in code that runs a _lot_ where */
|
||||
#ifdef __GNUC__
|
||||
# define LIKELY(x) __builtin_expect(!!(x), 1)
|
||||
# define UNLIKELY(x) __builtin_expect(!!(x), 0)
|
||||
#else
|
||||
# define LIKELY(x) (x)
|
||||
# define UNLIKELY(x) (x)
|
||||
#endif
|
||||
|
||||
#endif // BLI_UTILDEFINES_H
|
||||
|
@ -40,7 +40,7 @@ set(INC
|
||||
|
||||
set(INC_SYS
|
||||
${ZLIB_INCLUDE_DIRS}
|
||||
${GLEW_INCLUDE_PATH}
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
|
@ -33,7 +33,7 @@ set(INC
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
../../gpu
|
||||
../../gpu
|
||||
../../../../intern/guardedalloc
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user