blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix wrong tile size calculated in Cycles 

Was causing extra overscan pixels, and was confusing multiple workers
check after fix T91994.
This commit is contained in:
Sergey Sharybin 2021-10-07 16:19:50 +02:00
parent 0f58cc1594
commit 0d4c53ecfe
Notes: blender-bot 2023-02-14 08:10:10 +01:00 
Referenced by issue #91994, Blender 3.0 Crash when Cycles rendering GPU+CPU
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
intern/cycles/render/tile.cpp
View File

@ -411,25 +411,22 @@ Tile TileManager::get_tile_for_index(int index) const
const int tile_index_y = index / tile_state_.num_tiles_x;
const int tile_index_x = index - tile_index_y * tile_state_.num_tiles_x;
const int tile_x = tile_index_x * tile_size_.x;
const int tile_y = tile_index_y * tile_size_.y;
const int tile_window_x = tile_index_x * tile_size_.x;
const int tile_window_y = tile_index_y * tile_size_.y;
Tile tile;
tile.x = tile_x - overscan_;
tile.y = tile_y - overscan_;
tile.width = tile_size_.x + 2 * overscan_;
tile.height = tile_size_.y + 2 * overscan_;
tile.x = max(0, tile_window_x - overscan_);
tile.y = max(0, tile_window_y - overscan_);
tile.x = max(tile.x, 0);
tile.y = max(tile.y, 0);
tile.width = min(tile.width, buffer_params_.width - tile.x);
tile.height = min(tile.height, buffer_params_.height - tile.y);
tile.window_x = tile_window_x - tile.x;
tile.window_y = tile_window_y - tile.y;
tile.window_width = min(tile_size_.x, buffer_params_.width - tile_window_x);
tile.window_height = min(tile_size_.y, buffer_params_.height - tile_window_y);
tile.window_x = tile_x - tile.x;
tile.window_y = tile_y - tile.y;
tile.window_width = min(tile_size_.x, buffer_params_.width - (tile.x + tile.window_x));
tile.window_height = min(tile_size_.y, buffer_params_.height - (tile.y + tile.window_y));
tile.width = min(buffer_params_.width - tile.x, tile.window_x + tile.window_width + overscan_);
tile.height = min(buffer_params_.height - tile.y,
tile.window_y + tile.window_height + overscan_);
return tile;
}