minigbm: factor out metadata from struct bo
Generated using coccinelle:
@@
struct bo *B;
@@
- B->width
+ B->width
BUG=chromium:924405
TEST=compile
Change-Id: I4da1731a650d198ce7f2bda3031a47b2f9c3041c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/1815566
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
diff --git a/dri.c b/dri.c
index a9c1ed7..f61134b 100644
--- a/dri.c
+++ b/dri.c
@@ -193,7 +193,7 @@
int ret, dri_format, stride, offset;
struct dri_driver *dri = bo->drv->priv;
- assert(bo->num_planes == 1);
+ assert(bo->meta.num_planes == 1);
dri_format = drm_format_to_dri_format(format);
/* Gallium drivers require shared to get the handle and stride. */
@@ -226,10 +226,10 @@
goto close_handle;
}
- bo->strides[0] = stride;
- bo->sizes[0] = stride * height;
- bo->offsets[0] = offset;
- bo->total_size = offset + bo->sizes[0];
+ bo->meta.strides[0] = stride;
+ bo->meta.sizes[0] = stride * height;
+ bo->meta.offsets[0] = offset;
+ bo->meta.total_size = offset + bo->meta.sizes[0];
return 0;
close_handle:
@@ -244,11 +244,12 @@
int ret;
struct dri_driver *dri = bo->drv->priv;
- assert(bo->num_planes == 1);
+ assert(bo->meta.num_planes == 1);
// clang-format off
bo->priv = dri->image_extension->createImageFromFds(dri->device, data->width, data->height,
- data->format, data->fds, bo->num_planes,
+ data->format, data->fds,
+ bo->meta.num_planes,
(int *)data->strides,
(int *)data->offsets, NULL);
// clang-format on
@@ -289,9 +290,9 @@
struct dri_driver *dri = bo->drv->priv;
/* GBM flags and DRI flags are the same. */
- vma->addr =
- dri->image_extension->mapImage(dri->context, bo->priv, 0, 0, bo->width, bo->height,
- map_flags, (int *)&vma->map_strides[plane], &vma->priv);
+ vma->addr = dri->image_extension->mapImage(dri->context, bo->priv, 0, 0, bo->meta.width,
+ bo->meta.height, map_flags,
+ (int *)&vma->map_strides[plane], &vma->priv);
if (!vma->addr)
return MAP_FAILED;