Module: Mesa Branch: master Commit: ec21148311fd50f7171c50e921536f5c3e4360b3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec21148311fd50f7171c50e921536f5c3e4360b3
Author: Lucas Stach <[email protected]> Date: Thu Oct 29 16:50:54 2020 +0100 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 <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7367> --- src/gallium/drivers/etnaviv/etnaviv_resource.c | 3 ++- src/gallium/drivers/etnaviv/etnaviv_screen.c | 4 +--- src/gallium/drivers/etnaviv/etnaviv_screen.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c index 7ed0f137ddc..07224ca301d 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_resource.c +++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c @@ -520,7 +520,7 @@ etna_resource_from_handle(struct pipe_screen *pscreen, 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 @@ etna_resource_from_handle(struct pipe_screen *pscreen, 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 3cc7dcec148..7b4a23d0c8b 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -853,7 +853,7 @@ fail: 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 @@ etna_screen_bo_from_handle(struct pipe_screen *pscreen, 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 59e186fb12a..62c714009d6 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.h +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.h @@ -97,7 +97,7 @@ etna_screen(struct pipe_screen *pscreen) 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, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
