diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-09-18 18:32:53 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-09-18 18:34:23 +0300 |
commit | fd1bc90679a89a29172683939827be9c565e2217 (patch) | |
tree | 02d4bc3389f29df59b3a32e5842cb14556a6e8fc /intern/cycles | |
parent | 0ffd288fab5686f55d68d0d39baf59568f4389e7 (diff) |
Cycles: sync changes from standalone repository
* Windows build fixes
* Workaround for Hydra + OpenColorIO link issue
* Bump version
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 26 | ||||
-rw-r--r-- | intern/cycles/cmake/macros.cmake | 4 | ||||
-rw-r--r-- | intern/cycles/scene/shader.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/util/version.h | 4 |
4 files changed, 22 insertions, 16 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index aaeb85f700d..5854c80fb9f 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -69,6 +69,7 @@ if(CYCLES_STANDALONE_REPOSITORY) _set_default(BOOST_ROOT "${_cycles_lib_dir}/boost") _set_default(BLOSC_ROOT_DIR "${_cycles_lib_dir}/blosc") _set_default(EMBREE_ROOT_DIR "${_cycles_lib_dir}/embree") + _set_default(EPOXY_ROOT_DIR "${_cycles_lib_dir}/epoxy") _set_default(IMATH_ROOT_DIR "${_cycles_lib_dir}/imath") _set_default(GLEW_ROOT_DIR "${_cycles_lib_dir}/glew") _set_default(JPEG_ROOT "${_cycles_lib_dir}/jpeg") @@ -91,7 +92,11 @@ if(CYCLES_STANDALONE_REPOSITORY) _set_default(USD_ROOT_DIR "${_cycles_lib_dir}/usd") _set_default(WEBP_ROOT_DIR "${_cycles_lib_dir}/webp") _set_default(ZLIB_ROOT "${_cycles_lib_dir}/zlib") - _set_default(LEVEL_ZERO_ROOT_DIR "${_cycles_lib_dir}/level-zero") + if(WIN32) + set(LEVEL_ZERO_ROOT_DIR ${_cycles_lib_dir}/level_zero) + else() + set(LEVEL_ZERO_ROOT_DIR ${_cycles_lib_dir}/level-zero) + endif() _set_default(SYCL_ROOT_DIR "${_cycles_lib_dir}/dpcpp") # Ignore system libraries @@ -197,17 +202,17 @@ endif() if(CYCLES_STANDALONE_REPOSITORY) if(MSVC AND EXISTS ${_cycles_lib_dir}) set(OPENEXR_INCLUDE_DIR ${OPENEXR_ROOT_DIR}/include) - set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_ROOT_DIR}/include/OpenEXR) + set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_ROOT_DIR}/include/OpenEXR ${IMATH_ROOT_DIR}/include ${IMATH_ROOT_DIR}/include/Imath) set(OPENEXR_LIBRARIES + optimized ${OPENEXR_ROOT_DIR}/lib/OpenEXR_s.lib + optimized ${OPENEXR_ROOT_DIR}/lib/OpenEXRCore_s.lib optimized ${OPENEXR_ROOT_DIR}/lib/Iex_s.lib - optimized ${OPENEXR_ROOT_DIR}/lib/Half_s.lib - optimized ${OPENEXR_ROOT_DIR}/lib/IlmImf_s.lib - optimized ${OPENEXR_ROOT_DIR}/lib/Imath_s.lib + optimized ${IMATH_ROOT_DIR}/lib/Imath_s.lib optimized ${OPENEXR_ROOT_DIR}/lib/IlmThread_s.lib + debug ${OPENEXR_ROOT_DIR}/lib/OpenEXR_s_d.lib + debug ${OPENEXR_ROOT_DIR}/lib/OpenEXRCore_s_d.lib debug ${OPENEXR_ROOT_DIR}/lib/Iex_s_d.lib - debug ${OPENEXR_ROOT_DIR}/lib/Half_s_d.lib - debug ${OPENEXR_ROOT_DIR}/lib/IlmImf_s_d.lib - debug ${OPENEXR_ROOT_DIR}/lib/Imath_s_d.lib + debug ${IMATH_ROOT_DIR}/lib/Imath_s_d.lib debug ${OPENEXR_ROOT_DIR}/lib/IlmThread_s_d.lib ) else() @@ -319,8 +324,8 @@ if(CYCLES_STANDALONE_REPOSITORY) if(NOT BOOST_VERSION) message(FATAL_ERROR "Unable to determine Boost version") endif() - set(BOOST_POSTFIX "vc141-mt-x64-${BOOST_VERSION}.lib") - set(BOOST_DEBUG_POSTFIX "vc141-mt-gd-x64-${BOOST_VERSION}.lib") + set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}.lib") + set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}.lib") set(BOOST_LIBRARIES optimized ${BOOST_ROOT}/lib/libboost_date_time-${BOOST_POSTFIX} optimized ${BOOST_ROOT}/lib/libboost_iostreams-${BOOST_POSTFIX} @@ -459,6 +464,7 @@ if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_NANOVDB) if(MSVC AND EXISTS ${_cycles_lib_dir}) set(NANOVDB_INCLUDE_DIR ${NANOVDB_ROOT_DIR}/include) + set(NANOVDB_INCLUDE_DIRS ${NANOVDB_INCLUDE_DIR}) else() find_package(NanoVDB REQUIRED) endif() diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake index abadfc2c1ac..786d061599f 100644 --- a/intern/cycles/cmake/macros.cmake +++ b/intern/cycles/cmake/macros.cmake @@ -169,13 +169,13 @@ macro(cycles_install_libraries target) FILES ${TBB_ROOT_DIR}/bin/tbb_debug${CMAKE_SHARED_LIBRARY_SUFFIX} ${OPENVDB_ROOT_DIR}/bin/openvdb_d${CMAKE_SHARED_LIBRARY_SUFFIX} - DESTINATION $<TARGET_FILE_DIR:${target}>) + DESTINATION ${CMAKE_INSTALL_PREFIX}) else() install( FILES ${TBB_ROOT_DIR}/bin/tbb${CMAKE_SHARED_LIBRARY_SUFFIX} ${OPENVDB_ROOT_DIR}/bin/openvdb${CMAKE_SHARED_LIBRARY_SUFFIX} - DESTINATION $<TARGET_FILE_DIR:${target}>) + DESTINATION ${CMAKE_INSTALL_PREFIX}) endif() endif() endmacro() diff --git a/intern/cycles/scene/shader.cpp b/intern/cycles/scene/shader.cpp index 96a8f40bbad..56670c6e4e3 100644 --- a/intern/cycles/scene/shader.cpp +++ b/intern/cycles/scene/shader.cpp @@ -780,7 +780,7 @@ static bool to_scene_linear_transform(OCIO::ConstConfigRcPtr &config, { OCIO::ConstProcessorRcPtr processor; try { - processor = config->getProcessor(OCIO::ROLE_SCENE_LINEAR, colorspace); + processor = config->getProcessor("scene_linear", colorspace); } catch (OCIO::Exception &) { return false; @@ -834,7 +834,7 @@ void ShaderManager::init_xyz_transforms() #ifdef WITH_OCIO /* Get from OpenColorO config if it has the required roles. */ OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig(); - if (!(config && config->hasRole(OCIO::ROLE_SCENE_LINEAR))) { + if (!(config && config->hasRole("scene_linear"))) { return; } diff --git a/intern/cycles/util/version.h b/intern/cycles/util/version.h index 8260dd4f55d..fb02c3eaeb7 100644 --- a/intern/cycles/util/version.h +++ b/intern/cycles/util/version.h @@ -9,7 +9,7 @@ CCL_NAMESPACE_BEGIN #define CYCLES_VERSION_MAJOR 3 -#define CYCLES_VERSION_MINOR 2 +#define CYCLES_VERSION_MINOR 4 #define CYCLES_VERSION_PATCH 0 #define CYCLES_MAKE_VERSION_STRING2(a, b, c) #a "." #b "." #c @@ -19,7 +19,7 @@ CCL_NAMESPACE_BEGIN /* Blender libraries version compatible with this version */ -#define CYCLES_BLENDER_LIBRARIES_VERSION 3.1 +#define CYCLES_BLENDER_LIBRARIES_VERSION 3.3 CCL_NAMESPACE_END |