diff options
| author | Marek Olšák <[email protected]> | 2012-07-14 15:34:29 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-07-17 21:22:14 +0200 |
| commit | d1ca16b2738644d17c10e736ca36981f69f5fa87 (patch) | |
| tree | ba1b83f65e75d5f631cb0ae2a5c77442b03355ab | |
| parent | 585baac652ffa172fb3fbbdd4c7559d03b7c27ef (diff) | |
r600g: remove unused flag have_depth_fb
This is a leftover from:
commit fe1fd675565231b49d3ac53d0b4bec39d8bc6781
Author: Marek Olšák <[email protected]>
Date: Sun Jul 8 03:10:37 2012 +0200
r600g: don't flush depth textures set as colorbuffers
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 3 |
4 files changed, 3 insertions, 10 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 72ddc0b6c7b..ad0eb2f949b 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -1315,9 +1315,6 @@ void evergreen_cb(struct r600_context *rctx, struct r600_pipe_state *rstate, rtex = (struct r600_resource_texture*)state->cbufs[cb]->texture; pipe_tex = state->cbufs[cb]->texture; - if (rtex->is_depth) - rctx->have_depth_fb = TRUE; - if (rtex->is_depth && !rtex->is_flushing_texture) { r600_init_flushed_depth_texture(&rctx->context, state->cbufs[cb]->texture, NULL); @@ -1695,7 +1692,6 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx, util_copy_framebuffer_state(&rctx->framebuffer, state); /* build states */ - rctx->have_depth_fb = 0; rctx->export_16bpc = true; rctx->nr_cbufs = state->nr_cbufs; for (i = 0; i < state->nr_cbufs; i++) { diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 200f0a2ca59..4688b62f2fb 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -329,7 +329,7 @@ struct r600_context { struct u_upload_mgr *uploader; struct util_slab_mempool pool_transfers; - boolean have_depth_texture, have_depth_fb; + boolean have_depth_texture; unsigned default_ps_gprs, default_vs_gprs; diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 4f475b3d8d4..0091fe77c5c 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -1395,9 +1395,6 @@ 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->is_depth) - rctx->have_depth_fb = TRUE; - if (rtex->is_depth && !rtex->is_flushing_texture) { rtex = rtex->flushed_depth_texture; } @@ -1662,7 +1659,6 @@ static void r600_set_framebuffer_state(struct pipe_context *ctx, util_copy_framebuffer_state(&rctx->framebuffer, state); /* build states */ - rctx->have_depth_fb = 0; rctx->export_16bpc = true; rctx->nr_cbufs = state->nr_cbufs; diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 4fa269919a1..84c7d5e5e6d 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -845,8 +845,9 @@ static void r600_update_derived_state(struct r600_context *rctx) unsigned ps_dirty = 0; if (!rctx->blitter->running) { - if (rctx->have_depth_fb || rctx->have_depth_texture) + if (rctx->have_depth_texture) { r600_flush_all_depth_textures(rctx); + } } if (rctx->chip_class < EVERGREEN) { |