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

panfrost: Fix stride check when mipmapping

Browse source 
Now that we support custom strides on mipmapped textures (theoretically,
at least), extend the stride check to support mipmaps.  Fixes incorrect
strides of linear windows in Weston.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-06-07 17:07:13 -07:00
parent 416fc3b5ef
commit d89e0716a1
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/panfrost/pan_context.c
View file

@ -1994,15 +1994,23 @@ panfrost_create_sampler_view(
/* Check if we need to set a custom stride by computing the "expected"
* stride and comparing it to what the BO actually wants. Only applies
* to linear textures TODO: Mipmap? */
* to linear textures, since tiled/compressed textures have strict
* alignment requirements for their strides as it is */
unsigned actual_stride = prsrc->bo->slices[0].stride;
unsigned first_level = template->u.tex.first_level;
unsigned last_level = template->u.tex.last_level;
if (prsrc->bo->layout == PAN_LINEAR &&
template->u.tex.last_level == 0 &&
template->u.tex.first_level == 0 &&
(texture->width0 * bytes_per_pixel) != actual_stride) {
usage2_layout |= MALI_TEX_MANUAL_STRIDE;
if (prsrc->bo->layout == PAN_LINEAR) {
for (unsigned l = first_level; l <= last_level; ++l) {
unsigned actual_stride = prsrc->bo->slices[l].stride;
unsigned width = u_minify(texture->width0, l);
unsigned comp_stride = width * bytes_per_pixel;
if (comp_stride != actual_stride) {
usage2_layout |= MALI_TEX_MANUAL_STRIDE;
break;
}
}
}
struct mali_texture_descriptor texture_descriptor = {