summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_blit.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-04-08 13:27:14 +0200
committerMarek Olšák <maraeo@gmail.com>2011-04-08 13:27:14 +0200
commit1329d9433496618ad02bb9a91eccecd9736fdf54 (patch)
treeb1d65a0a0a7988c443693372ce994c07b8c978f9 /src/gallium/drivers/r300/r300_blit.c
parent1bcdc1e319863ec531b7f03804332e6352e13780 (diff)
downloadexternal_mesa3d-1329d9433496618ad02bb9a91eccecd9736fdf54.zip
external_mesa3d-1329d9433496618ad02bb9a91eccecd9736fdf54.tar.gz
external_mesa3d-1329d9433496618ad02bb9a91eccecd9736fdf54.tar.bz2
r300g: fix crash with hyperz
r300_update_hyperz_state is no longer required to be called here.
Diffstat (limited to 'src/gallium/drivers/r300/r300_blit.c')
-rw-r--r--src/gallium/drivers/r300/r300_blit.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 37b635f..056b52f 100644
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -253,13 +253,11 @@ static void r300_clear(struct pipe_context* pipe,
} else if (r300->zmask_clear.dirty || r300->hiz_clear.dirty) {
/* Just clear zmask and hiz now, this does not use the standard draw
* procedure. */
- unsigned dwords;
-
/* Calculate zmask_clear and hiz_clear atom sizes. */
- r300_update_hyperz_state(r300);
- dwords = (r300->zmask_clear.dirty ? r300->zmask_clear.size : 0) +
- (r300->hiz_clear.dirty ? r300->hiz_clear.size : 0) +
- r300_get_num_cs_end_dwords(r300);
+ unsigned dwords =
+ (r300->zmask_clear.dirty ? r300->zmask_clear.size : 0) +
+ (r300->hiz_clear.dirty ? r300->hiz_clear.size : 0) +
+ r300_get_num_cs_end_dwords(r300);
/* Reserve CS space. */
if (dwords > (R300_MAX_CMDBUF_DWORDS - r300->cs->cdw)) {