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

zink: use scanout obj when returning resource param info

Browse source 
embarrassing typo since the base obj has no modifier data available

cc: mesa-stable

fixes #5980

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14875>
(cherry picked from commit 960e72417f)
This commit is contained in:
Mike Blumenkrantz 2022-02-04 08:29:28 -05:00 • committed by Dylan Baker
parent 83eef372a2
commit 2c7d0e1b49
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -355,7 +355,7 @@
"description": "zink: use scanout obj when returning resource param info",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

4
src/gallium/drivers/zink/zink_resource.c
View file

@ -1039,7 +1039,7 @@ zink_resource_get_param(struct pipe_screen *pscreen, struct pipe_context *pctx,
switch (param) {
case PIPE_RESOURCE_PARAM_NPLANES:
if (screen->info.have_EXT_image_drm_format_modifier)
*value = pscreen->get_dmabuf_modifier_planes(pscreen, res->obj->modifier, pres->format);
*value = pscreen->get_dmabuf_modifier_planes(pscreen, obj->modifier, pres->format);
else
*value = 1;
break;
@ -1069,7 +1069,7 @@ zink_resource_get_param(struct pipe_screen *pscreen, struct pipe_context *pctx,
}
case PIPE_RESOURCE_PARAM_MODIFIER: {
*value = res->obj->modifier;
*value = obj->modifier;
break;
}