Mesa (master): r300g: assert-fail when calling resource_resolve

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Feb 12 12:29:12 2012 +0100

r300g: assert-fail when calling resource_resolve

And reset the dest pointer to NULL after it.

---

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

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 83cad42..b9ce857 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -1257,6 +1257,8 @@ static void r300_resource_resolve(struct pipe_context *pipe,
     struct r300_aa_state *aa = (struct r300_aa_state*)r300->aa_state.state;
     static const union pipe_color_union color;
 
+    assert(0 && "Resource resolve is unsupported, invalid call.");
+
     memset(&surf_tmpl, 0, sizeof(surf_tmpl));
     surf_tmpl.format = info->src.res->format;
     surf_tmpl.u.tex.first_layer =
@@ -1288,6 +1290,7 @@ static void r300_resource_resolve(struct pipe_context *pipe,
                                       info->dst.y1 - info->dst.y0);
 
     /* Disable AA resolve. */
+    aa->dest = NULL;
     aa->aaresolve_ctl = 0;
     r300->aa_state.size = 4;
     r300_mark_atom_dirty(r300, &r300->aa_state);