diff options
| author | Marek Olšák <[email protected]> | 2012-02-12 12:29:12 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-02-12 13:07:51 +0100 |
| commit | 6d89a795a551f63fc3fa0a9406cf7a9e8b6cb53d (patch) | |
| tree | 2f10034a3224a05a0df635c0525f889fb77a7b1b /src/gallium/drivers/r300/r300_render.c | |
| parent | c565ff60d6fce8c3402e60e6475c03717b297965 (diff) | |
r300g: assert-fail when calling resource_resolve
And reset the dest pointer to NULL after it.
Diffstat (limited to 'src/gallium/drivers/r300/r300_render.c')
| -rw-r--r-- | 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 83cad42c415..b9ce857d43c 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); |