From 567bcb93871cf7b1097db212dafb782caf502f66 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 26 Oct 2021 15:39:58 +0200 Subject: Cleanup: skip unnecessary OIIO image setup when not using tiled render --- intern/cycles/session/tile.cpp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'intern/cycles/session') 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; } } -- cgit v1.2.3