[Bf-blender-cvs] [567bcb93871] master: Cleanup: skip unnecessary OIIO image setup when not using tiled render
Brecht Van Lommel
noreply at git.blender.org
Tue Oct 26 15:49:20 CEST 2021
Commit: 567bcb93871cf7b1097db212dafb782caf502f66
Author: Brecht Van Lommel
Date: Tue Oct 26 15:39:58 2021 +0200
Branches: master
https://developer.blender.org/rB567bcb93871cf7b1097db212dafb782caf502f66
Cleanup: skip unnecessary OIIO image setup when not using tiled render
===================================================================
M intern/cycles/session/tile.cpp
===================================================================
diff --git a/intern/cycles/session/tile.cpp b/intern/cycles/session/tile.cpp
index 816bf4d5fa0..56bc519378f 100644
--- a/intern/cycles/session/tile.cpp
+++ b/intern/cycles/session/tile.cpp
@@ -367,20 +367,26 @@ void TileManager::update(const BufferParams ¶ms, const Scene *scene)
buffer_params_ = params;
- /* TODO(sergey): Proper Error handling, so that if configuration has failed we don't attempt to
- * write to a partially configured file. */
- configure_image_spec_from_buffer(&write_state_.image_spec, buffer_params_, tile_size_);
+ if (has_multiple_tiles()) {
+ /* TODO(sergey): Proper Error handling, so that if configuration has failed we don't attempt to
+ * write to a partially configured file. */
+ configure_image_spec_from_buffer(&write_state_.image_spec, buffer_params_, tile_size_);
- const DenoiseParams denoise_params = scene->integrator->get_denoise_params();
- const AdaptiveSampling adaptive_sampling = scene->integrator->get_adaptive_sampling();
+ const DenoiseParams denoise_params = scene->integrator->get_denoise_params();
+ const AdaptiveSampling adaptive_sampling = scene->integrator->get_adaptive_sampling();
- node_to_image_spec_atttributes(
- &write_state_.image_spec, &denoise_params, ATTR_DENOISE_SOCKET_PREFIX);
+ node_to_image_spec_atttributes(
+ &write_state_.image_spec, &denoise_params, ATTR_DENOISE_SOCKET_PREFIX);
- if (adaptive_sampling.use) {
- overscan_ = 4;
+ if (adaptive_sampling.use) {
+ overscan_ = 4;
+ }
+ else {
+ overscan_ = 0;
+ }
}
else {
+ write_state_.image_spec = ImageSpec();
overscan_ = 0;
}
}
More information about the Bf-blender-cvs
mailing list