Module: Mesa
Branch: master
Commit: d71a50f83146864df097566c413454366a61bb3c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d71a50f83146864df097566c413454366a61bb3c
Author: Rob Clark <robdcl...@gmail.com>
Date: Tue Dec 18 10:27:10 2018 -0500
freedreno: combine fd_resource_layer_offset()/fd_resource_offset()
We really only need this logic in one place.
Signed-off-by: Rob Clark <robdcl...@gmail.com>
---
src/gallium/drivers/freedreno/freedreno_resource.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c
b/src/gallium/drivers/freedreno/freedreno_resource.c
index 06e68af3a8..482ce94959 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -347,17 +347,6 @@ fd_blit_to_staging(struct fd_context *ctx, struct
fd_transfer *trans)
do_blit(ctx, &blit, false);
}
-static unsigned
-fd_resource_layer_offset(struct fd_resource *rsc,
- struct fd_resource_slice
*slice,
- unsigned layer)
-{
- if (rsc->layer_first)
- return layer * rsc->layer_size;
- else
- return layer * slice->size0;
-}
-
static void fd_resource_transfer_flush_region(struct pipe_context *pctx,
struct pipe_transfer *ptrans,
const struct pipe_box *box)
@@ -626,10 +615,10 @@ fd_resource_transfer_map(struct pipe_context *pctx,
}
buf = fd_bo_map(rsc->bo);
- offset = slice->offset +
+ offset =
box->y / util_format_get_blockheight(format) * ptrans->stride +
box->x / util_format_get_blockwidth(format) * rsc->cpp +
- fd_resource_layer_offset(rsc, slice, box->z);
+ fd_resource_offset(rsc, level, box->z);
if (usage & PIPE_TRANSFER_WRITE)
rsc->valid = true;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
