diff options
author | Marek Olšák <[email protected]> | 2012-04-10 21:29:06 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2012-04-24 01:39:21 +0200 |
commit | a52b3338c6e51421e3836ae210cd98d9c1ec337b (patch) | |
tree | 0b9d312f88760bbdc91bdd3e9d48195bfde6dce0 /src/gallium/drivers/r300/r300_texture.c | |
parent | 7d36478d888accd18d55cc76ba41af0ad7d3baf8 (diff) |
u_vbuf: remove u_vbuf_resource
Diffstat (limited to 'src/gallium/drivers/r300/r300_texture.c')
-rw-r--r-- | src/gallium/drivers/r300/r300_texture.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index 75749e78b2d..8c5ee058b9e 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -728,7 +728,7 @@ void r300_texture_setup_format_state(struct r300_screen *screen, unsigned height0_override, struct r300_texture_format_state *out) { - struct pipe_resource *pt = &tex->b.b.b; + struct pipe_resource *pt = &tex->b.b; struct r300_texture_desc *desc = &tex->tex; boolean is_r500 = screen->caps.is_r500; unsigned width, height, depth; @@ -886,12 +886,12 @@ r300_texture_create_object(struct r300_screen *rscreen, if (base->nr_samples > 1) return NULL; - pipe_reference_init(&tex->b.b.b.reference, 1); - tex->b.b.b.screen = &rscreen->screen; - tex->b.b.b.usage = base->usage; - tex->b.b.b.bind = base->bind; - tex->b.b.b.flags = base->flags; - tex->b.b.vtbl = &r300_texture_vtbl; + pipe_reference_init(&tex->b.b.reference, 1); + tex->b.b.screen = &rscreen->screen; + tex->b.b.usage = base->usage; + tex->b.b.bind = base->bind; + tex->b.b.flags = base->flags; + tex->b.vtbl = &r300_texture_vtbl; tex->tex.microtile = microtile; tex->tex.macrotile[0] = macrotile; tex->tex.stride_in_bytes_override = stride_in_bytes_override; @@ -1033,7 +1033,7 @@ struct pipe_surface* r300_create_surface_custom(struct pipe_context * ctx, /* Height must be aligned to the size of a tile. */ tile_height = r300_get_pixel_alignment(surface->base.format, - tex->b.b.b.nr_samples, + tex->b.b.nr_samples, tex->tex.microtile, tex->tex.macrotile[level], DIM_HEIGHT, 0); |