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

panfrost: Fix formats converting uninit from AFBC

Browse source 
If no slices were valid (the resource is uninitialized), we were reading
a bogus PIPE_FORMAT_NONE format from the blit.dst.format. Fix this --
and guard against scope similar issues -- by hoisting the blit
assignments out of the loop so they're valid.

Fixes: 9d0ad7fd2e ("panfrost: Patch the gallium driver to use pan_image_layout_init()")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10415>
(cherry picked from commit c220976fd0)
This commit is contained in:
Alyssa Rosenzweig 2021-04-22 19:14:47 -04:00 • committed by Eric Engestrom
parent a0614e1135
commit 2e6cf74e63
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -220,7 +220,7 @@
"description": "panfrost: Fix formats converting uninit from AFBC",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "9d0ad7fd2e1c56a1771e253086a5d4862d54e358"
},

33
src/gallium/drivers/panfrost/pan_resource.c
View file

@ -999,8 +999,7 @@ pan_resource_modifier_convert(struct panfrost_context *ctx,
panfrost_resource_create_with_modifier(
ctx->base.screen, &rsrc->base, modifier);
struct panfrost_resource *tmp_rsrc = pan_resource(tmp_prsrc);
struct pipe_blit_info blit = {0};
enum pipe_format blit_fmt = pan_blit_format(tmp_rsrc->base.format);
unsigned depth = rsrc->base.target == PIPE_TEXTURE_3D ?
rsrc->base.depth0 : rsrc->base.array_size;
@ -1008,22 +1007,22 @@ pan_resource_modifier_convert(struct panfrost_context *ctx,
struct pipe_box box =
{ 0, 0, 0, rsrc->base.width0, rsrc->base.height0, depth };
struct pipe_blit_info blit = {
.dst.resource = &tmp_rsrc->base,
.dst.format = blit_fmt,
.dst.box = box,
.src.resource = &rsrc->base,
.src.format = pan_blit_format(rsrc->base.format),
.src.box = box,
.mask = util_format_get_mask(blit_fmt),
.filter = PIPE_TEX_FILTER_NEAREST
};
for (int i = 0; i <= rsrc->base.last_level; i++) {
if (!rsrc->state.slices[i].data_valid)
continue;
blit.dst.resource = &tmp_rsrc->base;
blit.dst.format = pan_blit_format(tmp_rsrc->base.format);
blit.dst.level = i;
blit.dst.box = box;
blit.src.resource = &rsrc->base;
blit.src.format = pan_blit_format(rsrc->base.format);
blit.src.level = i;
blit.src.box = box;
blit.mask = util_format_get_mask(blit.dst.format);
blit.filter = PIPE_TEX_FILTER_NEAREST;
panfrost_blit(&ctx->base, &blit);
if (rsrc->state.slices[i].data_valid) {
blit.dst.level = blit.src.level = i;
panfrost_blit(&ctx->base, &blit);
}
}
panfrost_bo_unreference(rsrc->image.data.bo);