From d334d591a71c41d6a1eb4f2ea6cdabedc425e42f Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Fri, 24 Feb 2012 17:13:19 +0100 Subject: r600g: rename r600_resource_texture::depth to bool is_depth It's used as a boolean. --- src/gallium/drivers/r600/r600_state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium/drivers/r600/r600_state.c') diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index b5fa45124c1..dee6dc19d68 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -950,7 +950,7 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c format = 0; } - if (tmp->depth && !tmp->is_flushing_texture) { + if (tmp->is_depth && !tmp->is_flushing_texture) { r600_texture_depth_flush(ctx, texture, TRUE); tmp = tmp->flushed_depth_texture; } @@ -1077,7 +1077,7 @@ static void r600_set_sampler_views(struct r600_context *rctx, for (i = 0; i < count; i++) { if (rviews[i]) { - if (((struct r600_resource_texture *)rviews[i]->base.texture)->depth) + if (((struct r600_resource_texture *)rviews[i]->base.texture)->is_depth) rctx->have_depth_texture = true; /* Changing from array to non-arrays textures and vice versa requires updating TEX_ARRAY_OVERRIDE. */ @@ -1341,10 +1341,10 @@ static void r600_cb(struct r600_context *rctx, struct r600_pipe_state *rstate, surf = (struct r600_surface *)state->cbufs[cb]; rtex = (struct r600_resource_texture*)state->cbufs[cb]->texture; - if (rtex->depth) + if (rtex->is_depth) rctx->have_depth_fb = TRUE; - if (rtex->depth && !rtex->is_flushing_texture) { + if (rtex->is_depth && !rtex->is_flushing_texture) { rtex = rtex->flushed_depth_texture; } -- cgit v1.2.3