From c4241a831f3a3b8cff707ea7fb4e2a99c830b697 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 27 Apr 2022 12:10:37 -0400 Subject: [PATCH] panfrost: Use row_stride even for linear resources In that case, they match up. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_resource.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c index c6ffb0e..6a13e5c 100644 --- a/src/gallium/drivers/panfrost/pan_resource.c +++ b/src/gallium/drivers/panfrost/pan_resource.c @@ -942,7 +942,7 @@ panfrost_ptr_map(struct pipe_context *pctx, /* Staging resources have one LOD: level 0. Query the strides * on this LOD. */ - transfer->base.stride = staging->image.layout.slices[0].line_stride; + transfer->base.stride = staging->image.layout.slices[0].row_stride; transfer->base.layer_stride = panfrost_get_layer_stride(&staging->image.layout, 0); @@ -1088,7 +1088,7 @@ panfrost_ptr_map(struct pipe_context *pctx, if ((usage & dpw) == dpw && rsrc->index_cache) return NULL; - transfer->base.stride = rsrc->image.layout.slices[level].line_stride; + transfer->base.stride = rsrc->image.layout.slices[level].row_stride; transfer->base.layer_stride = panfrost_get_layer_stride(&rsrc->image.layout, level); @@ -1103,7 +1103,7 @@ panfrost_ptr_map(struct pipe_context *pctx, return bo->ptr.cpu + rsrc->image.layout.slices[level].offset + box->z * transfer->base.layer_stride - + box_blocks.y * rsrc->image.layout.slices[level].line_stride + + box_blocks.y * rsrc->image.layout.slices[level].row_stride + box_blocks.x * bytes_per_block; } } @@ -1284,7 +1284,7 @@ panfrost_ptr_unmap(struct pipe_context *pctx, util_copy_rect( bo->ptr.cpu + prsrc->image.layout.slices[0].offset, prsrc->base.format, - prsrc->image.layout.slices[0].line_stride, + prsrc->image.layout.slices[0].row_stride, 0, 0, transfer->box.width, transfer->box.height, -- 2.7.4