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

panfrost: Correctly calculate tiled stride

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Fixes: bde19c0e7b ("panfrost: Fix tiled texture "stride"s on Bifrost")
Tested-by: Christian Hewitt <christianshewitt@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5474>
This commit is contained in:
Alyssa Rosenzweig 2020-06-15 12:42:40 -04:00 • committed by Marge Bot
parent 6b1498f7ac
commit 92553b6290
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/panfrost/encoder/pan_texture.c
View file

@ -170,17 +170,18 @@ panfrost_estimate_texture_payload_size(
/* Bifrost requires a tile stride for tiled textures. This stride is computed
* as (16 * bpp * width) assuming there is at least one tile (width >= 16).
* Otherwise if width < 16, the blob puts zero. Interactions with AFBC are
* Otherwise if height <= 16, the blob puts zero. Interactions with AFBC are
* currently unknown.
*/
static unsigned
panfrost_nonlinear_stride(enum mali_texture_layout layout,
unsigned bytes_per_pixel,
unsigned width)
unsigned width,
unsigned height)
{
if (layout == MALI_TEXTURE_TILED) {
return (width < 16) ? 0 : (16 * bytes_per_pixel * ALIGN_POT(width, 16));
return (height <= 16) ? 0 : (16 * bytes_per_pixel * ALIGN_POT(width, 16));
} else {
unreachable("TODO: AFBC on Bifrost");
}
@ -193,7 +194,7 @@ panfrost_emit_texture_payload(
enum mali_format mali_format,
enum mali_texture_type type,
enum mali_texture_layout layout,
unsigned width,
unsigned width, unsigned height,
unsigned first_level, unsigned last_level,
unsigned first_layer, unsigned last_layer,
unsigned cube_stride,
@ -227,7 +228,8 @@ panfrost_emit_texture_payload(
slices[l].stride :
panfrost_nonlinear_stride(layout,
MAX2(desc->block.bits / 8, 1),
u_minify(width, l));
u_minify(width, l),
u_minify(height, l));
}
}
}
@ -288,7 +290,7 @@ panfrost_new_texture(
mali_format,
type,
layout,
width,
width, height,
first_level, last_level,
first_layer, last_layer,
cube_stride,
@ -325,7 +327,7 @@ panfrost_new_texture_bifrost(
mali_format,
type,
layout,
width,
width, height,
first_level, last_level,
first_layer, last_layer,
cube_stride,