etnaviv: simplify etna_screen_bo_from_handle
There is no need to have a out_stride parameter, as the only callsite
already has the winsys handle, which includes the stride, so there is
no need to pass the stride back and forth.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7367>
diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c
index 7ed0f13..07224ca 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_resource.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c
@@ -520,7 +520,7 @@
util_range_init(&rsc->valid_buffer_range);
prsc->screen = pscreen;
- rsc->bo = etna_screen_bo_from_handle(pscreen, handle, &level->stride);
+ rsc->bo = etna_screen_bo_from_handle(pscreen, handle);
if (!rsc->bo)
goto fail;
@@ -531,6 +531,7 @@
level->width = tmpl->width0;
level->height = tmpl->height0;
level->depth = tmpl->depth0;
+ level->stride = handle->stride;
level->offset = handle->offset;
/* Determine padding of the imported resource. */
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index 3cc7dce..7b4a23d 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -853,7 +853,7 @@
struct etna_bo *
etna_screen_bo_from_handle(struct pipe_screen *pscreen,
- struct winsys_handle *whandle, unsigned *out_stride)
+ struct winsys_handle *whandle)
{
struct etna_screen *screen = etna_screen(pscreen);
struct etna_bo *bo;
@@ -872,8 +872,6 @@
return NULL;
}
- *out_stride = whandle->stride;
-
return bo;
}
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.h b/src/gallium/drivers/etnaviv/etnaviv_screen.h
index 59e186f..62c7140 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.h
@@ -97,7 +97,7 @@
struct etna_bo *
etna_screen_bo_from_handle(struct pipe_screen *pscreen,
- struct winsys_handle *whandle, unsigned *out_stride);
+ struct winsys_handle *whandle);
struct pipe_screen *
etna_screen_create(struct etna_device *dev, struct etna_gpu *gpu,