Blender Git Commit Log
Git Commits -> Revision 1b4961b
Revision 1b4961b by Brecht Van Lommel (master) February 12, 2021, 18:06 (GMT) |
OpenColorIO: upgrade to version 2.0.0 Ref T84819 Build System ============ This is an API breaking new version, and the updated code only builds with OpenColorIO 2.0 and later. Adding backwards compatibility was too complicated. * Tinyxml was replaced with Expat, adding a new dependency. * Yaml-cpp is now built as a dependency on Unix, as was already done on Windows. * Removed currently unused LCMS code. * Pystring remains built as part of OCIO itself, since it has no good build system. * Linux and macOS check for the OpenColorIO verison, and disable it if too old. Ref D10270 Processors and Transforms ========================= CPU processors now need to be created to do CPU processing. These are cached internally, but the cache lookup is not fast enough to execute per pixel or texture sample, so for performance these are now also exposed in the C API. The C API for transforms will no longer be needed afer all changes, so remove it to simplify the API and fallback implementation. Ref D10271 Display Transforms ================== Needs a bit more manual work constructing the transform. LegacyViewingPipeline could also have been used, but isn't really any simpler and since it's legacy we better not rely on it. We moved more logic into the opencolorio module, to simplify the API. There is no need to wrap a dozen functions just to be able to do this in C rather than C++. It's also tightly coupled to the GPU shader logic, and so should be in the same module. Ref D10271 GPU Display Shader ================== To avoid baking exposure and gamma into the GLSL shader and requiring slow recompiles when tweaking, we manually apply them in the shader. This leads to some logic duplicaton between the CPU and GPU display processor, but it seems unavoidable. Caching was also changed. Previously this was done both on the imbuf and opencolorio module levels. Now it's all done in the opencolorio module by simply matching color space names. We no longer use cacheIDs from OpenColorIO since computing them is expensive, and they are unlikely to match now that more is baked into the shader code. Shaders can now use multiple 2D textures, 3D textures and uniforms, rather than a single 3D texture. So allocating and binding those adds some code. Color space conversions for blending with overlays is now hardcoded in the shader. This was using harcoded numbers anyway, if this every becomes a general OpenColorIO transform it can be changed, but for now there is no point to add code complexity. Ref D10273 CIE XYZ ======= We need standard CIE XYZ values for rendering effects like blackbody emission. The relation to the scene linear role is based on OpenColorIO configuration. In OpenColorIO 2.0 configs roles can no longer have the same name as color spaces, which means our XYZ role and colorspace in the configuration give an error. Instead use the new standard aces_interchange role, which relates scene linear to a known scene referred color space. Compatibility with the old XYZ role is preserved, if the configuration file has no conflicting names. Also includes a non-functional change to the configuraton file to use an XYZ-to-ACES matrix instead of REC709-to-ACES, makes debugging a little easier since the matrix is the same one we have in the code now and that is also found easily in the ACES specs. Ref D10274 |
Commit Details:
Full Hash: 1b4961b318f14064bc3c915da7206a74146af95d
Parent Commit: 6b40ee6
Lines Changed: +1351, -1735
2 Added Paths:
/build_files/build_environment/cmake/expat.cmake (+35, -0) (View)
/release/datafiles/colormanagement/luts/xyz_to_aces.spimtx (+3, -0) (View)
/release/datafiles/colormanagement/luts/xyz_to_aces.spimtx (+3, -0) (View)
4 Deleted Paths:
/build_files/build_environment/cmake/lcms.cmake (+0, -31)
/build_files/build_environment/cmake/tinyxml.cmake (+0, -31)
/release/datafiles/colormanagement/luts/aces_to_xyz.spimtx (+0, -3)
/release/datafiles/colormanagement/luts/rec709_to_aces.spimtx (+0, -3)
/build_files/build_environment/cmake/tinyxml.cmake (+0, -31)
/release/datafiles/colormanagement/luts/aces_to_xyz.spimtx (+0, -3)
/release/datafiles/colormanagement/luts/rec709_to_aces.spimtx (+0, -3)
25 Modified Paths:
/build_files/build_environment/cmake/nasm.cmake (+2, -2) (Diff)
/build_files/build_environment/cmake/opencolorio.cmake (+30, -47) (Diff)
/build_files/build_environment/cmake/versions.cmake (+7, -7) (Diff)
/build_files/build_environment/cmake/yamlcpp.cmake (+7, -2) (Diff)
/build_files/build_environment/CMakeLists.txt (+5, -9) (Diff)
/build_files/build_environment/install_deps.sh (+6, -6) (Diff)
/build_files/cmake/Modules/FindOpenColorIO.cmake (+16, -3) (Diff)
/build_files/cmake/platform/platform_apple.cmake (+6, -1) (Diff)
/build_files/cmake/platform/platform_unix.cmake (+1, -1) (Diff)
/build_files/cmake/platform/platform_win32.cmake (+5, -3) (Diff)
/CMakeLists.txt (+2, -1) (Diff)
/intern/cycles/render/CMakeLists.txt (+4, -1) (Diff)
/intern/cycles/render/colorspace.cpp (+11, -8) (Diff)
/intern/cycles/render/shader.cpp (+87, -33) (Diff)
/intern/cycles/render/shader.h (+2, -0) (Diff)
/intern/opencolorio/fallback_impl.cc (+71, -295) (Diff)
/intern/opencolorio/gpu_shader_display_transform.glsl (+30, -12) (Diff)
/intern/opencolorio/ocio_capi.cc (+56, -149) (Diff)
/intern/opencolorio/ocio_capi.h (+32, -58) (Diff)
/intern/opencolorio/ocio_impl.cc (+170, -191) (Diff)
/intern/opencolorio/ocio_impl.h (+90, -157) (Diff)
/intern/opencolorio/ocio_impl_glsl.cc (+432, -355) (Diff)
/release/datafiles/colormanagement/config.ocio (+6, -3) (Diff)
/source/blender/imbuf/intern/colormanagement.c (+230, -319) (Diff)
/source/blender/imbuf/intern/IMB_colormanagement_intern.h (+5, -4) (Diff)
/build_files/build_environment/cmake/opencolorio.cmake (+30, -47) (Diff)
/build_files/build_environment/cmake/versions.cmake (+7, -7) (Diff)
/build_files/build_environment/cmake/yamlcpp.cmake (+7, -2) (Diff)
/build_files/build_environment/CMakeLists.txt (+5, -9) (Diff)
/build_files/build_environment/install_deps.sh (+6, -6) (Diff)
/build_files/cmake/Modules/FindOpenColorIO.cmake (+16, -3) (Diff)
/build_files/cmake/platform/platform_apple.cmake (+6, -1) (Diff)
/build_files/cmake/platform/platform_unix.cmake (+1, -1) (Diff)
/build_files/cmake/platform/platform_win32.cmake (+5, -3) (Diff)
/CMakeLists.txt (+2, -1) (Diff)
/intern/cycles/render/CMakeLists.txt (+4, -1) (Diff)
/intern/cycles/render/colorspace.cpp (+11, -8) (Diff)
/intern/cycles/render/shader.cpp (+87, -33) (Diff)
/intern/cycles/render/shader.h (+2, -0) (Diff)
/intern/opencolorio/fallback_impl.cc (+71, -295) (Diff)
/intern/opencolorio/gpu_shader_display_transform.glsl (+30, -12) (Diff)
/intern/opencolorio/ocio_capi.cc (+56, -149) (Diff)
/intern/opencolorio/ocio_capi.h (+32, -58) (Diff)
/intern/opencolorio/ocio_impl.cc (+170, -191) (Diff)
/intern/opencolorio/ocio_impl.h (+90, -157) (Diff)
/intern/opencolorio/ocio_impl_glsl.cc (+432, -355) (Diff)
/release/datafiles/colormanagement/config.ocio (+6, -3) (Diff)
/source/blender/imbuf/intern/colormanagement.c (+230, -319) (Diff)
/source/blender/imbuf/intern/IMB_colormanagement_intern.h (+5, -4) (Diff)