Module: Mesa Branch: staging/23.3 Commit: b52742c0189dd8f5db2052ec9b974ac7bac7b9c1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b52742c0189dd8f5db2052ec9b974ac7bac7b9c1
Author: Robert Mader <robert.ma...@collabora.com> Date: Sun Nov 19 22:14:16 2023 +0100 v3d/resource: Support offset query for multi-planar planes This is required in order to return the correct value for `gbm_dri_bo_get_offset()` for e.g. the second plane of a NV12 image. Use the newly introduced `util_resource` helper and, while on it, also add support for `gbm_bo_get_plane_count()`. Cc: mesa-stable Reviewed-by: Juan A. Suarez <jasua...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26283> (cherry picked from commit 2404483706f4396920e94f7abc80368b7d25a965) --- .pick_status.json | 2 +- src/gallium/drivers/v3d/v3d_resource.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e65b073624c..d574fd6baf1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -124,7 +124,7 @@ "description": "v3d/resource: Support offset query for multi-planar planes", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/v3d/v3d_resource.c b/src/gallium/drivers/v3d/v3d_resource.c index d4cccdb148d..7eec001c2ed 100644 --- a/src/gallium/drivers/v3d/v3d_resource.c +++ b/src/gallium/drivers/v3d/v3d_resource.c @@ -26,6 +26,7 @@ #include "util/u_memory.h" #include "util/format/u_format.h" #include "util/u_inlines.h" +#include "util/u_resource.h" #include "util/u_surface.h" #include "util/u_transfer_helper.h" #include "util/u_upload_mgr.h" @@ -473,18 +474,22 @@ v3d_resource_get_param(struct pipe_screen *pscreen, enum pipe_resource_param param, unsigned usage, uint64_t *value) { - struct v3d_resource *rsc = v3d_resource(prsc); + struct v3d_resource *rsc = + (struct v3d_resource *)util_resource_at_index(prsc, plane); switch (param) { case PIPE_RESOURCE_PARAM_STRIDE: *value = rsc->slices[level].stride; return true; case PIPE_RESOURCE_PARAM_OFFSET: - *value = 0; + *value = rsc->slices[level].offset; return true; case PIPE_RESOURCE_PARAM_MODIFIER: *value = v3d_resource_modifier(rsc); return true; + case PIPE_RESOURCE_PARAM_NPLANES: + *value = util_resource_num(prsc); + return true; default: return false; }
