r600g: rename pitch in texture to pitch_in_bytes

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 4e95d4c490588774c19e045e9ed179031e1abc56..54d2233467a14cbb3443788732f528fcd8bf91dd 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -451,7 +451,7 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
                bo[0] = rbuffer->bo;
                bo[1] = rbuffer->bo;
        }
-       pitch = align(tmp->pitch[0] / tmp->bpt, 8);
+       pitch = align(tmp->pitch_in_bytes[0] / tmp->bpt, 8);
 
        /* FIXME properly handle first level != 0 */
        r600_pipe_state_add_reg(rstate, R_030000_RESOURCE0_WORD0,
@@ -740,8 +740,8 @@ static void evergreen_cb(struct r600_pipe_context *rctx, struct r600_pipe_state
        bo[1] = rbuffer->bo;
        bo[2] = rbuffer->bo;
 
-       pitch = (rtex->pitch[level] / rtex->bpt) / 8 - 1;
-       slice = (rtex->pitch[level] / rtex->bpt) * state->cbufs[cb]->height / 64 - 1;
+       pitch = (rtex->pitch_in_bytes[level] / rtex->bpt) / 8 - 1;
+       slice = (rtex->pitch_in_bytes[level] / rtex->bpt) * state->cbufs[cb]->height / 64 - 1;
        ntype = 0;
        desc = util_format_description(rtex->resource.base.b.format);
        if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB)
@@ -802,8 +802,8 @@ static void evergreen_db(struct r600_pipe_context *rctx, struct r600_pipe_state
        rbuffer = &rtex->resource;
 
        level = state->zsbuf->level;
-       pitch = (rtex->pitch[level] / rtex->bpt) / 8 - 1;
-       slice = (rtex->pitch[level] / rtex->bpt) * state->zsbuf->height / 64 - 1;
+       pitch = (rtex->pitch_in_bytes[level] / rtex->bpt) / 8 - 1;
+       slice = (rtex->pitch_in_bytes[level] / rtex->bpt) * state->zsbuf->height / 64 - 1;
        format = r600_translate_dbformat(state->zsbuf->texture->format);
        stencil_format = r600_translate_stencilformat(state->zsbuf->texture->format);
 
@@ -815,7 +815,7 @@ static void evergreen_db(struct r600_pipe_context *rctx, struct r600_pipe_state
        if (stencil_format) {
                uint32_t stencil_offset;
 
-               stencil_offset = ((state->zsbuf->height * rtex->pitch[level]) + 255) & ~255;
+               stencil_offset = ((state->zsbuf->height * rtex->pitch_in_bytes[level]) + 255) & ~255;
                r600_pipe_state_add_reg(rstate, R_02804C_DB_STENCIL_READ_BASE,
                                        (state->zsbuf->offset + stencil_offset + r600_bo_offset(rbuffer->bo)) >> 8, 0xFFFFFFFF, rbuffer->bo);
                r600_pipe_state_add_reg(rstate, R_028054_DB_STENCIL_WRITE_BASE,

diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h
index 323960960d628bc20c2655c486096f35da815e31..04b31ddf899272a818635f129699ed30ff5d0901 100644 (file)
--- a/src/gallium/drivers/r600/r600_resource.h
+++ b/src/gallium/drivers/r600/r600_resource.h
@@ -50,7 +50,7 @@ struct r600_resource {
 struct r600_resource_texture {
        struct r600_resource            resource;
        unsigned long                   offset[PIPE_MAX_TEXTURE_LEVELS];
-       unsigned long                   pitch[PIPE_MAX_TEXTURE_LEVELS];
+       unsigned long                   pitch_in_bytes[PIPE_MAX_TEXTURE_LEVELS];
        unsigned long                   layer_size[PIPE_MAX_TEXTURE_LEVELS];
        unsigned long                   pitch_override;
        unsigned long                   bpt;

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index b2e7c282e28861c6a989630cdea36364b2d97bb7..8c8e7986522df14e9b95efe1f43928e3873b416c 100644 (file)
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -653,7 +653,7 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c
                bo[0] = rbuffer->bo;
                bo[1] = rbuffer->bo;
        }
-       pitch = align(tmp->pitch[0] / tmp->bpt, 8);
+       pitch = align(tmp->pitch_in_bytes[0] / tmp->bpt, 8);
 
        /* FIXME properly handle first level != 0 */
        r600_pipe_state_add_reg(rstate, R_038000_RESOURCE0_WORD0,
@@ -943,8 +943,8 @@ static void r600_cb(struct r600_pipe_context *rctx, struct r600_pipe_state *rsta
        bo[1] = rbuffer->bo;
        bo[2] = rbuffer->bo;
 
-       pitch = (rtex->pitch[level] / rtex->bpt) / 8 - 1;
-       slice = (rtex->pitch[level] / rtex->bpt) * state->cbufs[cb]->height / 64 - 1;
+       pitch = (rtex->pitch_in_bytes[level] / rtex->bpt) / 8 - 1;
+       slice = (rtex->pitch_in_bytes[level] / rtex->bpt) * state->cbufs[cb]->height / 64 - 1;
        ntype = 0;
        desc = util_format_description(rtex->resource.base.b.format);
        if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB)
@@ -1003,8 +1003,8 @@ static void r600_db(struct r600_pipe_context *rctx, struct r600_pipe_state *rsta
        rbuffer = &rtex->resource;
 
        level = state->zsbuf->level;
-       pitch = (rtex->pitch[level] / rtex->bpt) / 8 - 1;
-       slice = (rtex->pitch[level] / rtex->bpt) * state->zsbuf->height / 64 - 1;
+       pitch = (rtex->pitch_in_bytes[level] / rtex->bpt) / 8 - 1;
+       slice = (rtex->pitch_in_bytes[level] / rtex->bpt) * state->zsbuf->height / 64 - 1;
        format = r600_translate_dbformat(state->zsbuf->texture->format);
 
        r600_pipe_state_add_reg(rstate, R_02800C_DB_DEPTH_BASE,

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index e825aeee3501ea4062952a42c9934f45543ad76f..5bdfd49939738850a75c7f83a90def8f5ad5d844 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -151,7 +151,7 @@ static void r600_setup_miptree(struct pipe_screen *screen,
                        size = layer_size * u_minify(ptex->depth0, i);
                rtex->offset[i] = offset;
                rtex->layer_size[i] = layer_size;
-               rtex->pitch[i] = pitch;
+               rtex->pitch_in_bytes[i] = pitch;
                offset += size;
        }
        rtex->size = offset;
@@ -340,7 +340,7 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx,
        trans->transfer.sr = sr;
        trans->transfer.usage = usage;
        trans->transfer.box = *box;
-       trans->transfer.stride = rtex->pitch[sr.level];
+       trans->transfer.stride = rtex->pitch_in_bytes[sr.level];
        trans->offset = r600_texture_get_offset(rtex, sr.level, box->z, sr.face);
        if (rtex->depth) {
                r = r600_texture_depth_flush(ctx, texture);