Mesa (master): r300g: fix fb_state atom size

[Marek Olšák]

Module: Mesa
Branch: master
Commit: a4be3b6b312496305de473b5af219a3afd84f6c6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4be3b6b312496305de473b5af219a3afd84f6c6

Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Aug  5 19:04:01 2010 +0200

r300g: fix fb_state atom size

---

 src/gallium/drivers/r300/r300_state.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index 374aa25..1e6b81d 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -684,6 +684,7 @@ void r300_mark_fb_state_dirty(struct r300_context *r300,
                               enum r300_fb_state_change change)
 {
     struct pipe_framebuffer_state *state = r300->fb_state.state;
+    boolean has_hyperz = r300->rws->get_value(r300->rws, R300_CAN_HYPERZ);
 
     /* What is marked as dirty depends on the enum r300_fb_state_change. */
     r300->gpu_flush.dirty = TRUE;
@@ -701,8 +702,11 @@ void r300_mark_fb_state_dirty(struct r300_context *r300,
 
     if (r300->cbzb_clear)
         r300->fb_state.size += 10;
-    else if (state->zsbuf)
-        r300->fb_state.size += r300->screen->caps.hiz_ram ? 18 : 14;
+    else if (state->zsbuf) {
+        r300->fb_state.size += 10;
+        if (has_hyperz)
+            r300->fb_state.size += r300->screen->caps.hiz_ram ? 8 : 4;
+    }
 
     /* The size of the rest of atoms stays the same. */
 }