diff options
author | Marek Olšák <maraeo@gmail.com> | 2011-02-10 05:36:44 +0100 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2011-02-10 11:27:35 +0100 |
commit | 56ba7e913fef0ea2b1bead582108f9ab3ab8263d (patch) | |
tree | f65cb5007441ab0a8fc07e6baa13efc71218acbe /src/gallium/drivers/r300/r300_blit.c | |
parent | ce9c0d280104c8001a3ee360b07218ad3d260e46 (diff) | |
download | external_mesa3d-56ba7e913fef0ea2b1bead582108f9ab3ab8263d.zip external_mesa3d-56ba7e913fef0ea2b1bead582108f9ab3ab8263d.tar.gz external_mesa3d-56ba7e913fef0ea2b1bead582108f9ab3ab8263d.tar.bz2 |
r300g: consolidate buffers and textures to r300_resource
Transfers and create/destroy are still handled separately.
Diffstat (limited to 'src/gallium/drivers/r300/r300_blit.c')
-rw-r--r-- | src/gallium/drivers/r300/r300_blit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index e29990d..cadd090 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -114,7 +114,7 @@ static boolean r300_fast_zclear_allowed(struct r300_context *r300) struct pipe_framebuffer_state *fb = (struct pipe_framebuffer_state*)r300->fb_state.state; - return r300_texture(fb->zsbuf->texture)->desc.zmask_dwords[fb->zsbuf->u.tex.level]; + return r300_resource(fb->zsbuf->texture)->tex.zmask_dwords[fb->zsbuf->u.tex.level]; } static uint32_t r300_depth_clear_value(enum pipe_format format, @@ -190,8 +190,8 @@ static void r300_clear(struct pipe_context* pipe, (struct pipe_framebuffer_state*)r300->fb_state.state; struct r300_hyperz_state *hyperz = (struct r300_hyperz_state*)r300->hyperz_state.state; - struct r300_texture *zstex = - fb->zsbuf ? r300_texture(fb->zsbuf->texture) : NULL; + struct r300_resource *zstex = + fb->zsbuf ? r300_resource(fb->zsbuf->texture) : NULL; uint32_t width = fb->width; uint32_t height = fb->height; boolean can_hyperz = r300->rws->get_value(r300->rws, R300_CAN_HYPERZ); |