bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
7ea2dedd59
blender/intern/cycles/CMakeLists.txt

263 lines
7.6 KiB
CMake
Raw Normal View History

Cycles: Add a cmake config to easily compile Cycles Standalone. On Linux/Mac OS X, simply type "make cycles" inside the Blender source directory, to get a standalone build of the engine. Reviewed by: Brecht Differential Revision: https://developer.blender.org/D228
2014-01-20 19:41:54 +00:00
# Standalone or with Blender
if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE)
set(CYCLES_INSTALL_PATH "")
else()
set(WITH_CYCLES_BLENDER ON)
set(CYCLES_INSTALL_PATH "scripts/addons/cycles")
endif()
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
# External Libraries
include(cmake/external_libs.cmake)
# Build Flags
Remove SCons building system While SCons building system was serving us really good for ages it's no longer having much attention by the developers and started to become quite a difficult task to maintain. What's even worse -- there started to be quite serious divergence between SCons and CMake which was only accumulating over the releases now. The fact that none of the active developers are really using SCons and that our main studio is also using CMake spotting bugs in the SCons builds became quite a difficult task and we aren't always spotting them in time. Meanwhile CMake became really mature building system which is available on every platform we support and arguably it's also easier and more robust to use. This commit includes: - Removal of actual SCons building system - Removal of SCons git submodule - Removal of documentation which is stored in the sources and covers SCons - Tweaks to the buildbot master to stop using SCons submodule (this change requires deploying to the server) - Tweaks to the install dependencies script to skip installing or mentioning SCons building system - Tweaks to various helper scripts to avoid mention of SCons folders/files as well Reviewers: mont29, dingto, dfelinto, lukastoenne, lukasstockner97, brecht, Severin, merwin, aligorith, psy-fi, campbellbarton, juicyfruit Reviewed By: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1680
2016-01-04 09:20:48 +00:00
# todo: this code could be refactored a bit to avoid duplication
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
# note: CXX_HAS_SSE is needed in case passing SSE flags fails altogether (gcc-arm)
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
Cycles: Add an option to build single kernel only which fits current CPU This seems quite useful for the development, so you don't need to wait all the kernels to be re-compiled when working on a new feature, which speeds up re-iteration. Marked as an advanced option, so if it doesn't work so well in practice it's safe to revert anyway.
2016-03-25 15:09:05 +00:00
if(WITH_CYCLES_NATIVE_ONLY)
set(CXX_HAS_SSE FALSE)
set(CXX_HAS_AVX FALSE)
set(CXX_HAS_AVX2 FALSE)
add_definitions(
-DWITH_KERNEL_NATIVE
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
elseif(NOT WITH_CPU_SSE)
Futher tweaks to WITH_CPU_SSE option Explicitly disable SSE kernels in Cycles when this option is used.
2014-10-15 12:43:47 +00:00
set(CXX_HAS_SSE FALSE)
Cycles: Correction to previous SSE/AVX flags detection Ensure AVX/AVX2 is not used when Cycles is configured with WITH_CPU_SSE set to OFF.
2014-12-14 22:51:43 +00:00
set(CXX_HAS_AVX FALSE)
set(CXX_HAS_AVX2 FALSE)
Futher tweaks to WITH_CPU_SSE option Explicitly disable SSE kernels in Cycles when this option is used.
2014-10-15 12:43:47 +00:00
elseif(WIN32 AND MSVC)
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
set(CXX_HAS_SSE TRUE)
Cycles: Fix compilation error with compilers which doesn't support AVX For SSE checks still could be decoupled to be able to compile SSE2 kernel and not SSE4 depending on the CPU or so.
2014-12-07 10:22:05 +00:00
set(CXX_HAS_AVX TRUE)
set(CXX_HAS_AVX2 TRUE)
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
Cycles: enable /arch:AVX in msvc 11 and later versions for avx kernel This enables VEX-encoding in AVX kernel for windows msvc builds and gives 5-10% speedup for different scenes. Reviewers: juicyfruit, dingto, brecht Reviewed By: brecht CC: brecht Differential Revision: https://developer.blender.org/D284
2014-02-03 13:22:50 +00:00
# /arch:AVX for VC2012 and above
if(NOT MSVC_VERSION LESS 1700)
set(CYCLES_AVX_ARCH_FLAGS "/arch:AVX")
Cycles: Add an AVX2 CPU kernel. This kernel is compiled with AVX2, FMA3, and BMI compiler flags. At the moment only Intel Haswell benefits from this, but future AMD CPUs will have these instructions as well. Makes rendering on Haswell CPUs a few percent faster, only benchmarked with clang on OS X though. Part of my GSoC 2014.
2014-06-13 20:23:58 +00:00
set(CYCLES_AVX2_ARCH_FLAGS "/arch:AVX /arch:AVX2")
Cycles: enable /arch:AVX in msvc 11 and later versions for avx kernel This enables VEX-encoding in AVX kernel for windows msvc builds and gives 5-10% speedup for different scenes. Reviewers: juicyfruit, dingto, brecht Reviewed By: brecht CC: brecht Differential Revision: https://developer.blender.org/D284
2014-02-03 13:22:50 +00:00
elseif(NOT CMAKE_CL_64)
set(CYCLES_AVX_ARCH_FLAGS "/arch:SSE2")
Cycles: Add an AVX2 CPU kernel. This kernel is compiled with AVX2, FMA3, and BMI compiler flags. At the moment only Intel Haswell benefits from this, but future AMD CPUs will have these instructions as well. Makes rendering on Haswell CPUs a few percent faster, only benchmarked with clang on OS X though. Part of my GSoC 2014.
2014-06-13 20:23:58 +00:00
set(CYCLES_AVX2_ARCH_FLAGS "/arch:SSE2")
Cycles: enable /arch:AVX in msvc 11 and later versions for avx kernel This enables VEX-encoding in AVX kernel for windows msvc builds and gives 5-10% speedup for different scenes. Reviewers: juicyfruit, dingto, brecht Reviewed By: brecht CC: brecht Differential Revision: https://developer.blender.org/D284
2014-02-03 13:22:50 +00:00
endif()
Cycles: attempt to fix internal compile error with some visual studio builds
2013-06-18 13:19:16 +00:00
# there is no /arch:SSE3, but intrinsics are available anyway
Cleanup: * Silence /arch:SSE2 warning on msvc x64.
2013-08-31 03:18:55 +00:00
if(CMAKE_CL_64)
Cycles: fix 3-5% performance regression in msvc builds caused by a typo in stackchecking flags.
2014-03-31 17:44:02 +00:00
set(CYCLES_SSE2_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_SSE3_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_SSE41_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_AVX_KERNEL_FLAGS "${CYCLES_AVX_ARCH_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Cycles: Add an AVX2 CPU kernel. This kernel is compiled with AVX2, FMA3, and BMI compiler flags. At the moment only Intel Haswell benefits from this, but future AMD CPUs will have these instructions as well. Makes rendering on Haswell CPUs a few percent faster, only benchmarked with clang on OS X though. Part of my GSoC 2014.
2014-06-13 20:23:58 +00:00
set(CYCLES_AVX2_KERNEL_FLAGS "${CYCLES_AVX2_ARCH_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Cleanup: * Silence /arch:SSE2 warning on msvc x64.
2013-08-31 03:18:55 +00:00
else()
Cycles: fix 3-5% performance regression in msvc builds caused by a typo in stackchecking flags.
2014-03-31 17:44:02 +00:00
set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_SSE41_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_AVX_KERNEL_FLAGS "${CYCLES_AVX_ARCH_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Cycles: Add an AVX2 CPU kernel. This kernel is compiled with AVX2, FMA3, and BMI compiler flags. At the moment only Intel Haswell benefits from this, but future AMD CPUs will have these instructions as well. Makes rendering on Haswell CPUs a few percent faster, only benchmarked with clang on OS X though. Part of my GSoC 2014.
2014-06-13 20:23:58 +00:00
set(CYCLES_AVX2_KERNEL_FLAGS "${CYCLES_AVX2_ARCH_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Cleanup: * Silence /arch:SSE2 warning on msvc x64.
2013-08-31 03:18:55 +00:00
endif()
Cycles: optimized SSE BVH traversal now also works with SSE2 CPUs, so all the way back to Pentium 4, using a slightly less efficient instruction. Also ensure /Ox is used for Visual Studio for RelWithDebInfo builds.
2013-06-19 17:54:26 +00:00
Cycles: fix 3-5% performance regression in msvc builds caused by a typo in stackchecking flags.
2014-03-31 17:44:02 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Fix for Debug build on MSVC2008 and MSVC2012 after Cycles Kernel optimization: Compiler optimization was accidentally set to /Ox for debug build too. Changed this to be /Od in Debug and /Ox in Release mode.
2013-06-19 17:17:51 +00:00
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
Fix wrong cycles cmake + msvc build flags with relwithdebinfo and minsizerel. Patch by Karsten Schwenk.
2013-08-05 12:02:43 +00:00
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ox")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Ox")
Cycles * Compile all of cycles with -ffast-math again * Add scons compilation of cuda binaries, tested on mac/linux. * Add UI option for supported/experimental features, to make it more clear what is supported, opencl/subdivision is experimental. * Remove cycles xml exporter, was just for testing.
2011-12-01 16:33:21 +00:00
elseif(CMAKE_COMPILER_IS_GNUCC)
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
check_cxx_compiler_flag(-msse CXX_HAS_SSE)
Cycles: Fix compilation error with compilers which doesn't support AVX For SSE checks still could be decoupled to be able to compile SSE2 kernel and not SSE4 depending on the CPU or so.
2014-12-07 10:22:05 +00:00
check_cxx_compiler_flag(-mavx CXX_HAS_AVX)
check_cxx_compiler_flag(-mavx2 CXX_HAS_AVX2)
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
if(CXX_HAS_SSE)
set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2 -mfpmath=sse")
set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse")
set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mfpmath=sse")
Cycles: Fix compilation error with compilers which doesn't support AVX For SSE checks still could be decoupled to be able to compile SSE2 kernel and not SSE4 depending on the CPU or so.
2014-12-07 10:22:05 +00:00
endif()
if(CXX_HAS_AVX)
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
set(CYCLES_AVX_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx -mfpmath=sse")
Cycles: Fix compilation error with compilers which doesn't support AVX For SSE checks still could be decoupled to be able to compile SSE2 kernel and not SSE4 depending on the CPU or so.
2014-12-07 10:22:05 +00:00
endif()
if(CXX_HAS_AVX2)
Cycles: Use native float->half conversion instructions for Haswell CPUs. This makes OCIO viewport color correction a little bit faster (about -0.5s for 100 samples) Also set max half float value to 65504.0 to conform with IEEE 754.
2015-05-10 16:20:04 +00:00
set(CYCLES_AVX2_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -mf16c -mfpmath=sse")
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
endif()
Cycles * Compile all of cycles with -ffast-math again * Add scons compilation of cuda binaries, tested on mac/linux. * Add UI option for supported/experimental features, to make it more clear what is supported, opencl/subdivision is experimental. * Remove cycles xml exporter, was just for testing.
2011-12-01 16:33:21 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
Arrempt to fix Cycles compilation with Clang Issue is caused by missing sse flags for Clang compilers, this flags only was set for GNU C compilers. Added if branch for Clang now, which contains the same flags apart from -mfpmath=sse, This is because Clang was claiming it's unused argument. Probably OSX would need some further checks since it's also using Clang. I've got no idea why it could have worked for OSX before..
2013-07-07 18:29:57 +00:00
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
check_cxx_compiler_flag(-msse CXX_HAS_SSE)
Cycles: Fix compilation error with compilers which doesn't support AVX For SSE checks still could be decoupled to be able to compile SSE2 kernel and not SSE4 depending on the CPU or so.
2014-12-07 10:22:05 +00:00
check_cxx_compiler_flag(-mavx CXX_HAS_AVX)
check_cxx_compiler_flag(-mavx2 CXX_HAS_AVX2)
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
if(CXX_HAS_SSE)
set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2")
set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3")
set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1")
Cycles: Fix compilation error with compilers which doesn't support AVX For SSE checks still could be decoupled to be able to compile SSE2 kernel and not SSE4 depending on the CPU or so.
2014-12-07 10:22:05 +00:00
endif()
if(CXX_HAS_AVX)
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
set(CYCLES_AVX_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx")
Cycles: Fix compilation error with compilers which doesn't support AVX For SSE checks still could be decoupled to be able to compile SSE2 kernel and not SSE4 depending on the CPU or so.
2014-12-07 10:22:05 +00:00
endif()
if(CXX_HAS_AVX2)
Cycles: Use native float->half conversion instructions for Haswell CPUs. This makes OCIO viewport color correction a little bit faster (about -0.5s for 100 samples) Also set max half float value to 65504.0 to conform with IEEE 754.
2015-05-10 16:20:04 +00:00
set(CYCLES_AVX2_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -mf16c")
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
endif()
Arrempt to fix Cycles compilation with Clang Issue is caused by missing sse flags for Clang compilers, this flags only was set for GNU C compilers. Added if branch for Clang now, which contains the same flags apart from -mfpmath=sse, This is because Clang was claiming it's unused argument. Probably OSX would need some further checks since it's also using Clang. I've got no idea why it could have worked for OSX before..
2013-07-07 18:29:57 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
edits to cycles cmake files so cmake_consistency_check.py can parse them.
2011-11-08 20:27:37 +00:00
endif()
Cycles: hook up the CMake build system. New build instructions for Ubuntu Linux in the wiki: http://wiki.blender.org/index.php/Dev:2.5/Source/Cycles
2011-04-28 13:47:27 +00:00
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
if(CXX_HAS_SSE)
add_definitions(
-DWITH_KERNEL_SSE2
-DWITH_KERNEL_SSE3
-DWITH_KERNEL_SSE41
)
endif()
Scons: refactor cycles kernel code to avoid building the AVX kernel with compilers that don't support it. CMake still needs to updated to work the same for consistency, but this should fix the OS X buildbot at least.
2014-01-28 21:56:12 +00:00
Cycles: Fix compilation error with compilers which doesn't support AVX For SSE checks still could be decoupled to be able to compile SSE2 kernel and not SSE4 depending on the CPU or so.
2014-12-07 10:22:05 +00:00
if(CXX_HAS_AVX)
add_definitions(-DWITH_KERNEL_AVX)
endif()
if(CXX_HAS_AVX2)
add_definitions(-DWITH_KERNEL_AVX2)
endif()
Cycles: only use -fno-rtti with OSL (conflicts with -fsanitize=vptr)
2014-06-17 06:00:16 +00:00
if(WITH_CYCLES_OSL)
if(WIN32 AND MSVC)
set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
elseif(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
endif()
-fno-rtti is a gcc option which gives a warning when using MSVC
2012-11-26 13:48:48 +00:00
endif()
Cycles: * Fix excessive fireflies in Velvet BSDF (patch by David). * Disable some unused SSE code * Remove RTTI disabling flags for now, this is giving some compile issues and was only needed of OSL which we're not using yet.
2011-11-10 14:32:16 +00:00
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
# Definitions and Includes
Code cleanup: cmake
2014-03-13 12:31:06 +00:00
add_definitions(
${BOOST_DEFINITIONS}
${OPENIMAGEIO_DEFINITIONS}
)
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
Code cleanup: cmake
2014-03-13 12:31:06 +00:00
add_definitions(
-DCCL_NAMESPACE_BEGIN=namespace\ ccl\ {
-DCCL_NAMESPACE_END=}
)
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
Cycles Standalone: GUI flag was not passed correctly to the code, own mistake when I added the GUI build option.
2014-01-20 20:12:28 +00:00
if(WITH_CYCLES_STANDALONE_GUI)
add_definitions(-DWITH_CYCLES_STANDALONE_GUI)
endif()
Cycles: experimental OSL ptex reading code. This code can't actually be enabled for building and is incomplete, but it's here because we know we want to support this at some point and there's not much reason to have it in a separate branch if a simple #ifdef can disable it.
2013-11-28 00:38:23 +00:00
if(WITH_CYCLES_PTEX)
add_definitions(-DWITH_PTEX)
endif()
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
if(WITH_CYCLES_OSL)
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.
2011-12-29 01:46:58 +00:00
add_definitions(-DWITH_OSL)
Fix cycles windows link errors when building with OSL master branch.
2013-01-30 21:58:47 +00:00
add_definitions(-DOSL_STATIC_LIBRARY)
Cycles: use SYSTEM for external includes
2014-06-28 17:59:54 +00:00
include_directories(
SYSTEM
Cycles: Synchronize changes with standalone repository This changes were done in original commit of the standalone Cycles repository and needed here for easier patch synchronization.
2014-12-29 09:48:21 +00:00
${OSL_INCLUDE_DIR}
Cycles: use SYSTEM for external includes
2014-06-28 17:59:54 +00:00
)
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
endif()
Cycles microdisplacement: Support for Catmull-Clark subdivision via OpenSubdiv Enables Catmull-Clark subdivision meshes with support for creases and attribute subdivision. Still waiting on OpenSubdiv to fully support face varying interpolation for subdividing uv coordinates tho. Also there may be some inconsistencies with Blender's subdivision which will be resolved at a later time. Code for reading patch tables and creating patch maps is borrowed from OpenSubdiv. Reviewed By: brecht Differential Revision: https://developer.blender.org/D2111
2016-07-17 02:57:06 +00:00
if(WITH_CYCLES_OPENSUBDIV)
add_definitions(-DWITH_OPENSUBDIV)
include_directories(
SYSTEM
${OPENSUBDIV_INCLUDE_DIR}
)
endif()
Cycles: Reduce scope of some defines set in CMakeLists Should be no functional changes at all, just speeds up re-compilation when some features needs to be disabled for development purposes. For example, when running lots of Valgrind it's handy to disable any GPU devices because otherwise you'll be wasting quite some time in the driver while enumerating devices. Reviewers: dingto, lukasstockner97, brecht, juicyfruit Differential Revision: https://developer.blender.org/D1730
2016-01-12 15:50:43 +00:00
set(WITH_CYCLES_DEVICE_OPENCL TRUE)
set(WITH_CYCLES_DEVICE_CUDA TRUE)
set(WITH_CYCLES_DEVICE_MULTI TRUE)
Cycles render engine, initial commit. This is the engine itself, blender modifications and build instructions will follow later. Cycles uses code from some great open source projects, many thanks them: * BVH building and traversal code from NVidia's "Understanding the Efficiency of Ray Traversal on GPUs": http://code.google.com/p/understanding-the-efficiency-of-ray-traversal-on-gpus/ * Open Shading Language for a large part of the shading system: http://code.google.com/p/openshadinglanguage/ * Blender for procedural textures and a few other nodes. * Approximate Catmull Clark subdivision from NVidia Mesh tools: http://code.google.com/p/nvidia-mesh-tools/ * Sobol direction vectors from: http://web.maths.unsw.edu.au/~fkuo/sobol/ * Film response functions from: http://www.cs.columbia.edu/CAVE/software/softlib/dorf.php
2011-04-27 11:58:34 +00:00
CMake: De-duplicate checks around unordered maps and shared pointer Previously several areas were calling TEST_SHARED_PTR_SUPPORT and TEST_UNORDERED_MAP_SUPPORT which isn't that bad on it's own but was causing some quite verbose output with same information line printed multiple times. additionally, what's more worse, define flags for Ceres were duplicated in main CMakeLists and Ceres's CMakeLists. Now we've got a single place where checks for those classes are happening and other areas are simply checking for variables set by those check macros, keeping CMake output clean and nice.
2016-01-14 07:38:46 +00:00
if(CYCLES_STANDALONE_REPOSITORY)
TEST_UNORDERED_MAP_SUPPORT()
endif()
Fix C++11 build issues on OS X, remove references to outdated libs.
2016-05-16 18:03:59 +00:00
if(WITH_CXX11)
add_definitions(-DCYCLES_STD_UNORDERED_MAP)
elseif(HAVE_STD_UNORDERED_MAP_HEADER)
Cleanup: whitespace (CMake)
2015-07-18 08:21:17 +00:00
if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
add_definitions(-DCYCLES_STD_UNORDERED_MAP)
else()
if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
add_definitions(-DCYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
else()
add_definitions(-DCYCLES_NO_UNORDERED_MAP)
message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
endif()
endif()
Optionally use c++11 stuff instead of boost in cycles where possible. We do and continue to depend on boost though Reviewers: dingto, sergey Reviewed By: sergey Subscribers: #cycles Differential Revision: https://developer.blender.org/D1185
2015-03-29 20:12:22 +00:00
else()
Cleanup: whitespace (CMake)
2015-07-18 08:21:17 +00:00
if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
add_definitions(-DCYCLES_TR1_UNORDERED_MAP)
else()
add_definitions(-DCYCLES_NO_UNORDERED_MAP)
message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
endif()
Optionally use c++11 stuff instead of boost in cycles where possible. We do and continue to depend on boost though Reviewers: dingto, sergey Reviewed By: sergey Subscribers: #cycles Differential Revision: https://developer.blender.org/D1185
2015-03-29 20:12:22 +00:00
endif()
Cycles: Add support for debug passes Currently only summed number of traversal steps and intersections used by the camera ray intersection pass is implemented, but in the future we will support more debug passes which would help checking what things makes the scene slow. Example of such extra passes could be number of bounces, time spent on the shader tree evaluation and so. Implementation from the Cycles side is pretty much straightforward, could only mention here that it's a build-time option disabled by default. From the blender side it's implemented as a PASS_DEBUG with several subtypes possible. This way we don't need to create an extra DNA pass type for each of the debug passes, saving us a bits. Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D813
2014-10-04 13:00:26 +00:00
# Logging capabilities using GLog library.
Cycles: Add support of Glog logging This commit makes it possible to use Glog library for the debug logging. For now only possible when using CMake and in order to use the logging the WITH_CYCLES_LOGGING configuration variable is to be enabled. When this option is not enabled or when using Scons there's no difference in Cycles behavior at all, when using logging and no output to the console impact is gonna to be minimal. This is done in order to make it possible to have debug logging persistent in code (without need to add it when troubleshooting some bug and removing it afterwards). For now actual logging is not placed yet, only all the functions needed for the logging are written and so.
2014-09-08 12:01:24 +00:00
if(WITH_CYCLES_LOGGING)
add_definitions(-DWITH_CYCLES_LOGGING)
add_definitions(-DGOOGLE_GLOG_DLL_DECL=)
Cycles: Be ready for gflags namespace auto-detect This way it is now possible to use gflags >= 2.1, where all the functions were moved from google to gflags namespace. This isn't currently used in blender, but for standalone repository this change is essential.
2014-12-12 11:01:30 +00:00
add_definitions(-DCYCLES_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
Cycles: Fully support WITH_CYCLES_LOGGING option This commit generalizes logging module a little bit in making it possible to use Glog logging in standalone Cycles repository.
2014-11-15 20:12:19 +00:00
include_directories(
SYSTEM
${GLOG_INCLUDE_DIRS}
${GFLAGS_INCLUDE_DIRS}
)
Cycles: Add support of Glog logging This commit makes it possible to use Glog library for the debug logging. For now only possible when using CMake and in order to use the logging the WITH_CYCLES_LOGGING configuration variable is to be enabled. When this option is not enabled or when using Scons there's no difference in Cycles behavior at all, when using logging and no output to the console impact is gonna to be minimal. This is done in order to make it possible to have debug logging persistent in code (without need to add it when troubleshooting some bug and removing it afterwards). For now actual logging is not placed yet, only all the functions needed for the logging are written and so.
2014-09-08 12:01:24 +00:00
endif()
Cycles: Add support for debug passes Currently only summed number of traversal steps and intersections used by the camera ray intersection pass is implemented, but in the future we will support more debug passes which would help checking what things makes the scene slow. Example of such extra passes could be number of bounces, time spent on the shader tree evaluation and so. Implementation from the Cycles side is pretty much straightforward, could only mention here that it's a build-time option disabled by default. From the blender side it's implemented as a PASS_DEBUG with several subtypes possible. This way we don't need to create an extra DNA pass type for each of the debug passes, saving us a bits. Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D813
2014-10-04 13:00:26 +00:00
# Debugging capabilities (debug passes etc).
if(WITH_CYCLES_DEBUG)
add_definitions(-DWITH_CYCLES_DEBUG)
endif()
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
include_directories(
code cleanup: cycles now uses system includes for boost/oiio.. etc, so we dont get warnings from system headers.
2012-09-20 09:04:43 +00:00
SYSTEM
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
${BOOST_INCLUDE_DIR}
added FindOpenImageIO cmake module.
2011-09-18 04:55:22 +00:00
${OPENIMAGEIO_INCLUDE_DIRS}
OSL/cmake: the non-intrusive parts, so other os-maintainers can take code over
2012-09-24 19:06:28 +00:00
${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO
Revert recent OpenEXR cmake/linux fix and earlier OS X fix to use GCC for AVX. Both need a better solution and break working builds.
2014-01-27 18:11:36 +00:00
${OPENEXR_INCLUDE_DIR}
Code cleanup: cmake
2014-03-13 12:31:06 +00:00
${OPENEXR_INCLUDE_DIRS}
Cycles: Fix compilation error when OIIO is compiled with external PugiXML parser Basic idea is to check whether OIIO is compiled with embedded PugiXML parser and if so use PugiXML from OIIO, otherwise find a standalone PugiXML library.
2014-11-15 17:56:22 +00:00
${PUGIXML_INCLUDE_DIR}
Code cleanup: cmake
2014-03-13 12:31:06 +00:00
)
Cycles render engine, initial commit. This is the engine itself, blender modifications and build instructions will follow later. Cycles uses code from some great open source projects, many thanks them: * BVH building and traversal code from NVidia's "Understanding the Efficiency of Ray Traversal on GPUs": http://code.google.com/p/understanding-the-efficiency-of-ray-traversal-on-gpus/ * Open Shading Language for a large part of the shading system: http://code.google.com/p/openshadinglanguage/ * Blender for procedural textures and a few other nodes. * Approximate Catmull Clark subdivision from NVidia Mesh tools: http://code.google.com/p/nvidia-mesh-tools/ * Sobol direction vectors from: http://web.maths.unsw.edu.au/~fkuo/sobol/ * Film response functions from: http://www.cs.columbia.edu/CAVE/software/softlib/dorf.php
2011-04-27 11:58:34 +00:00
Cycles: Post-reintegration tweaks to ensure things do compile This commit contains all the tweaks which were missing in initial patch re-integration from the standalone Cycles repository. This commit also contains an utility cmake macro to help linking targets with different libraries for release/debug builds, the name currently is target_link_libraries_decoupled it gets a target and list of libraries and makes sure debug builds are using libraries with "_d" suffix. After all this changes it'll hopefully be easier to interchange patches between blender and standalone repositories, because they're now quite identical.
2014-12-31 20:01:31 +00:00
if(CYCLES_STANDALONE_REPOSITORY)
include_directories(../third_party/atomic)
else()
include_directories(../atomic)
endif()
Code cleanup: Add -Werror=float-conversion to Cycles
2014-05-02 21:22:14 +00:00
# Warnings
Fix '-Werror=float-conversion' error with gcc < 4.9, for CMake Scons is still TODO.
2014-05-03 08:54:02 +00:00
if(CMAKE_COMPILER_IS_GNUCXX)
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
Cycles: enable double promotion warning /w gcc
2014-10-08 08:58:40 +00:00
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
Cycles: Don't silence unused macro, remove the macro instead It's not really handy to silence something unused hoping for it'll be used in the future. We can end up with quite some silencing then. Also made this flag which i find rather useless to NOT cause -Werror in Cycles code.
2016-02-17 11:40:56 +00:00
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
Fix '-Werror=float-conversion' error with gcc < 4.9, for CMake Scons is still TODO.
2014-05-03 08:54:02 +00:00
unset(_has_cxxflag_float_conversion)
Cycles: enable double promotion warning /w gcc
2014-10-08 08:58:40 +00:00
unset(_has_cxxflag_double_promotion)
Cycles: Don't silence unused macro, remove the macro instead It's not really handy to silence something unused hoping for it'll be used in the future. We can end up with quite some silencing then. Also made this flag which i find rather useless to NOT cause -Werror in Cycles code.
2016-02-17 11:40:56 +00:00
unset(_has_no_error_unused_macros)
Code cleanup: Add -Werror=float-conversion to Cycles
2014-05-02 21:22:14 +00:00
endif()
Cycles render engine, initial commit. This is the engine itself, blender modifications and build instructions will follow later. Cycles uses code from some great open source projects, many thanks them: * BVH building and traversal code from NVidia's "Understanding the Efficiency of Ray Traversal on GPUs": http://code.google.com/p/understanding-the-efficiency-of-ray-traversal-on-gpus/ * Open Shading Language for a large part of the shading system: http://code.google.com/p/openshadinglanguage/ * Blender for procedural textures and a few other nodes. * Approximate Catmull Clark subdivision from NVidia Mesh tools: http://code.google.com/p/nvidia-mesh-tools/ * Sobol direction vectors from: http://web.maths.unsw.edu.au/~fkuo/sobol/ * Film response functions from: http://www.cs.columbia.edu/CAVE/software/softlib/dorf.php
2011-04-27 11:58:34 +00:00
# Subdirectories
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
if(WITH_CYCLES_BLENDER)
Cycles: Always use guarded allocator of vectors We don't have vectors re-allocation happening multiple times from inside a loop anymore, so we can safely switch to a memory guarded allocator for vectors and keep track on the memory usage at various stages of rendering. Additionally, when building from inside Blender repository, Cycles will use Blender's guarded allocator, so actual memory usage will be displayed in the Space Info header. There are couple of tricky aspects of the patch: - TaskScheduler::exit() now explicitly frees memory used by `threads`. This is needed because `threads` is a static member which destructor isn't getting called on Blender's exit which caused memory leak print to happen. This shouldn't give any measurable speed issues, reallocation of that vector is only one of fewzillion other allocations happening during synchronization. - Use regular guarded malloc (not aligned one). No idea why it was made to be aligned in the first place. Perhaps some corner case tests or so. Vector was never expected to be aligned anyway. Let's see if we'll have actual bugs with this. Reviewers: dingto, lukasstockner97, juicyfruit, brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D1774
2016-02-06 22:40:41 +00:00
add_definitions(-DWITH_BLENDER_GUARDEDALLOC)
UI: small tweak to tooltips for enum menus, it wasn't very clear which description was for the property and which for the item.
2011-11-18 21:06:36 +00:00
add_subdirectory(blender)
code cleanup: warnings
2012-06-01 14:59:06 +00:00
endif()
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
Fix compilation of cycles standalone and network device
2016-03-11 09:00:47 +00:00
if(WITH_CYCLES_NETWORK)
add_definitions(-DWITH_NETWORK)
endif()
Cycles / Standalone: * Rename test to standalone. Note: New CMAKE flag is WITH_CYCLES_STANDALONE.
2013-08-27 02:37:48 +00:00
if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK)
Cycles / CMake: * Removed PARTIO building code, partio code was removed already. * Include "app" dir only when building with CYCLES_TEST enabled.
2012-11-09 18:31:04 +00:00
add_subdirectory(app)
endif()
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
add_subdirectory(bvh)
add_subdirectory(device)
add_subdirectory(doc)
Code refactor: add generic Cycles node infrastructure. Differential Revision: https://developer.blender.org/D2016
2016-05-07 17:47:37 +00:00
add_subdirectory(graph)
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message
2011-08-16 16:15:34 +00:00
add_subdirectory(kernel)
add_subdirectory(render)
add_subdirectory(subd)
add_subdirectory(util)
Cycles: * Add back option to bundle CUDA kernel binaries with builds. * Disable runtime CUDA kernel compilation on Windows, couldn't get this working, since it seems to depend on visual studio being installed, even though for this particular case it shouldn't be needed. CMake only at the moment. * Runtime compilation on linux/mac should now work if nvcc is not installed in the default location, but available in PATH.
2011-11-10 12:52:17 +00:00
Cycles: Add some utility tests using GTests This is an initial move to have unittests to at least cover utility functions, which then could be extended further to test such areas as shader optimization and such. Currently only based on initial "infrastructure" layout and writing tests needed to test the no-boost patch. Note: This patch starts to use "<dir>/<header>.h" notation for the include statements which i just got used to do in other projects. Something what would be cool to use globally in the code eventually. Reviewers: dingto, juicyfruit, lukasstockner97, brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D1770
2016-02-06 18:09:44 +00:00
# TODO(sergey): Make this to work with standalone repository.
if(WITH_GTESTS)
add_subdirectory(test)
endif()
Cycles: Add a cmake config to easily compile Cycles Standalone. On Linux/Mac OS X, simply type "make cycles" inside the Blender source directory, to get a standalone build of the engine. Reviewed by: Brecht Differential Revision: https://developer.blender.org/D228
2014-01-20 19:41:54 +00:00
if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE)
delayed_do_install(${CMAKE_BINARY_DIR}/bin)
endif()
Reference in New Issue Copy Permalink