diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2009-11-30 20:29:18 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2009-11-30 20:29:18 +0100 |
| commit | ac400ffce62be47fc77e8d10cabcd39b92b6c627 (patch) | |
| tree | c99fc26392294b75bf88cb04a7853c63007424f0 /src/mesa/state_tracker/st_texture.c | |
| parent | 7fa1bcc05a237365e5ea09512453f29a91c7a141 (diff) | |
gallium: interface cleanups, remove nblocksx/y from pipe_texture and more
This patch removes nblocksx, nblocksy arrays from pipe_texture (can be
recalculated if needed). Furthermore, pipe_format_block struct is gone
completely (again, contains just derived state).
nblocksx, nblocksy, block are also removed from pipe_transfer, together with
the format enum (can be obtained from the texture associated with the transfer).
Diffstat (limited to 'src/mesa/state_tracker/st_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c index dbccee86c1..3035d78b61 100644 --- a/src/mesa/state_tracker/st_texture.c +++ b/src/mesa/state_tracker/st_texture.c @@ -104,7 +104,6 @@ st_texture_create(struct st_context *st, pt.width0 = width0; pt.height0 = height0; pt.depth0 = depth0; - pf_get_block(format, &pt.block); pt.tex_usage = usage; newtex = screen->texture_create(screen, &pt); @@ -242,8 +241,9 @@ st_surface_data(struct pipe_context *pipe, struct pipe_screen *screen = pipe->screen; void *map = screen->transfer_map(screen, dst); + assert(dst->texture); util_copy_rect(map, - &dst->block, + dst->texture->format, dst->stride, dstx, dsty, width, height, |