Mesa (main): zink: use scanout obj when returning resource param info
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Feb 4 23:37:25 UTC 2022
Module: Mesa
Branch: main
Commit: 960e72417f3e8885699cf384f690853e14ba44da
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=960e72417f3e8885699cf384f690853e14ba44da
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Fri Feb 4 08:29:28 2022 -0500
zink: use scanout obj when returning resource param info
embarrassing typo since the base obj has no modifier data available
cc: mesa-stable
fixes #5980
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14875>
---
src/gallium/drivers/zink/zink_resource.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 493e8b16d82..a61d9fda2f0 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -1042,7 +1042,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;
@@ -1072,7 +1072,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;
}
More information about the mesa-commit
mailing list