Mesa (master): vc4: Rename the slice's size0.
Eric Anholt
anholt at kemper.freedesktop.org
Mon Sep 29 18:29:39 UTC 2014
Module: Mesa
Branch: master
Commit: c4245d8b2ecac4a2fd4207894a722be6177c60bc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4245d8b2ecac4a2fd4207894a722be6177c60bc
Author: Eric Anholt <eric at anholt.net>
Date: Sat Sep 27 19:10:34 2014 -0700
vc4: Rename the slice's size0.
In the other related fields, "0" refers to the size of the first miplevel,
while this is a field in a slice. The other implicit slices we have
(cubemap layers) don't vary in size compared to the first one.
---
src/gallium/drivers/vc4/vc4_resource.c | 8 ++++----
src/gallium/drivers/vc4/vc4_resource.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c
index a71ae5b..3fb0b99 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -152,7 +152,7 @@ vc4_resource_transfer_map(struct pipe_context *pctx,
return buf + slice->offset +
box->y / util_format_get_blockheight(format) * ptrans->stride +
box->x / util_format_get_blockwidth(format) * rsc->cpp +
- box->z * slice->size0;
+ box->z * slice->size;
}
@@ -226,12 +226,12 @@ vc4_setup_slices(struct vc4_resource *rsc)
slice->offset = offset;
slice->stride = level_width * rsc->cpp;
- slice->size0 = level_height * slice->stride;
+ slice->size = level_height * slice->stride;
/* Note, since we have cubes but no 3D, depth is invariant
* with miplevel.
*/
- offset += slice->size0 * depth;
+ offset += slice->size * depth;
}
/* The texture base pointer that has to point to level 0 doesn't have
@@ -306,7 +306,7 @@ vc4_resource_create(struct pipe_screen *pscreen,
rsc->bo = vc4_bo_alloc(vc4_screen(pscreen),
rsc->slices[0].offset +
- rsc->slices[0].size0 * prsc->depth0,
+ rsc->slices[0].size * prsc->depth0,
"resource");
if (!rsc->bo)
goto fail;
diff --git a/src/gallium/drivers/vc4/vc4_resource.h b/src/gallium/drivers/vc4/vc4_resource.h
index caefbd0..7886929 100644
--- a/src/gallium/drivers/vc4/vc4_resource.h
+++ b/src/gallium/drivers/vc4/vc4_resource.h
@@ -37,7 +37,7 @@ struct vc4_transfer {
struct vc4_resource_slice {
uint32_t offset;
uint32_t stride;
- uint32_t size0;
+ uint32_t size;
/** One of VC4_TILING_FORMAT_* */
uint8_t tiling;
};
More information about the mesa-commit
mailing list