Mesa (master): r300g: remove the relocation after AARESOLVE_PITCH

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Feb 14 00:55:18 2011 +0100

r300g: remove the relocation after AARESOLVE_PITCH

---

 src/gallium/drivers/r300/r300_emit.c   |    2 --
 src/gallium/drivers/r300/r300_render.c |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index 13c1f2d..be5768a 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -354,9 +354,7 @@ void r300_emit_aa_state(struct r300_context *r300, unsigned size, void *state)
     if (aa->dest) {
         OUT_CS_REG(R300_RB3D_AARESOLVE_OFFSET, aa->dest->offset);
         OUT_CS_RELOC(aa->dest);
-
         OUT_CS_REG(R300_RB3D_AARESOLVE_PITCH, aa->dest->pitch);
-        OUT_CS_RELOC(aa->dest);
     }
 
     OUT_CS_REG(R300_RB3D_AARESOLVE_CTL, aa->aaresolve_ctl);
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 6767a55..0d50de5 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -1215,7 +1215,7 @@ static void r300_resource_resolve(struct pipe_context* pipe,
     aa->aaresolve_ctl =
         R300_RB3D_AARESOLVE_CTL_AARESOLVE_MODE_RESOLVE |
         R300_RB3D_AARESOLVE_CTL_AARESOLVE_ALPHA_AVERAGE;
-    r300->aa_state.size = 12;
+    r300->aa_state.size = 10;
     r300_mark_atom_dirty(r300, &r300->aa_state);
 
     /* Resolve the surface. */