radeonsi: Fix calculation of pitch value in sampler view state.
authorMichel Dänzer <michel.daenzer@amd.com>
Wed, 18 Apr 2012 08:37:15 +0000 (10:37 +0200)
committerMichel Dänzer <michel@daenzer.net>
Wed, 18 Apr 2012 08:52:33 +0000 (10:52 +0200)
src/gallium/drivers/radeonsi/evergreen_state.c

index f041f3db5c0833a87a794a565b34f5467e58a4a6..5048761fc7f75db73df6697096f133dad95b9c54 100644 (file)
@@ -1246,8 +1246,7 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
        height = texture->height0;
        depth = texture->depth0;
 
-       pitch = align(tmp->pitch_in_blocks[0] *
-                     util_format_get_blockwidth(state->format), 8);
+       pitch = tmp->pitch_in_blocks[0] * util_format_get_blockwidth(state->format);
        array_mode = tmp->array_mode[0];
        tile_type = tmp->tile_type;
 
@@ -1273,8 +1272,7 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
                          S_008F1C_LAST_LEVEL(state->u.tex.last_level) |
                          S_008F1C_TILING_INDEX(8) | /* XXX */
                          S_008F1C_TYPE(si_tex_dim(texture->target)));
-       view->state[4] = (S_008F20_DEPTH(depth - 1) |
-                         S_008F20_PITCH((pitch / 8) - 1));
+       view->state[4] = (S_008F20_DEPTH(depth - 1) | S_008F20_PITCH(pitch - 1));
        view->state[5] = (S_008F24_BASE_ARRAY(state->u.tex.first_layer) |
                          S_008F24_LAST_ARRAY(state->u.tex.last_layer));
        view->state[6] = 0;