diff options
| author | Jonathan Marek <[email protected]> | 2019-12-17 17:29:02 -0500 |
|---|---|---|
| committer | Jonathan Marek <[email protected]> | 2020-03-05 12:53:29 -0500 |
| commit | 55dac91adc40db191c385f9a2ce393f46dd9b859 (patch) | |
| tree | 9cd84cb80f6ea58ecfafe889f2b3b3343cd3904b /src/freedreno | |
| parent | 036230341f4f2e7b11791708015342cf9385cf76 (diff) | |
turnip: fix tile->slot calculation
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 <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3142>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3142>
Diffstat (limited to 'src/freedreno')
| -rw-r--r-- | src/freedreno/vulkan/tu_cmd_buffer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index b9408f87a4b..74997b31933 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -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) { |