fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

turnip: fix tile->slot calculation

Browse source 
Fixes HW binning cases when the horizontal number of tiles isn't divisible
by the horizontal number of pipes (only happens with more than 32 tiles).

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3142>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3142>
This commit is contained in:
Jonathan Marek 2019-12-17 17:29:02 -05:00
parent 036230341f
commit 55dac91adc
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/freedreno/vulkan/tu_cmd_buffer.c
View file

@ -318,6 +318,10 @@ tu_tiling_config_get_tile(const struct tu_tiling_config *tiling,
const uint32_t py = ty / tiling->pipe0.height;
const uint32_t sx = tx - tiling->pipe0.width * px;
const uint32_t sy = ty - tiling->pipe0.height * py;
/* last pipe has different width */
const uint32_t pipe_width =
MIN2(tiling->pipe0.width,
tiling->tile_count.width - px * tiling->pipe0.width);
assert(tx < tiling->tile_count.width && ty < tiling->tile_count.height);
assert(px < tiling->pipe_count.width && py < tiling->pipe_count.height);
@ -325,7 +329,7 @@ tu_tiling_config_get_tile(const struct tu_tiling_config *tiling,
/* convert to 1D indices */
tile->pipe = tiling->pipe_count.width * py + px;
tile->slot = tiling->pipe0.width * sy + sx;
tile->slot = pipe_width * sy + sx;
/* get the blit area for the tile */
tile->begin = (VkOffset2D) {