diff options
| author | Marek Olšák <maraeo@gmail.com> | 2010-07-29 20:52:17 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2010-07-29 20:57:18 +0200 |
| commit | d8d7a3e0f9629a220e2394dd7c6634f2d6a93e20 (patch) | |
| tree | 432c593e13c94f13c05423ab1542db0403803296 /src/gallium/drivers/r300/r300_flush.c | |
| parent | 3f4680d8e229d87e62972d0632c577873944d89d (diff) | |
| download | external_mesa3d-d8d7a3e0f9629a220e2394dd7c6634f2d6a93e20.zip external_mesa3d-d8d7a3e0f9629a220e2394dd7c6634f2d6a93e20.tar.gz external_mesa3d-d8d7a3e0f9629a220e2394dd7c6634f2d6a93e20.tar.bz2 | |
r300g/swtcl: fix crash in ETQW and minor fixups
The Draw flush inside r300_flush was the culprit.
Also, no need to flush Draw when changing a state since the flush is
already inside swtcl_draw_vbo.
Diffstat (limited to 'src/gallium/drivers/r300/r300_flush.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_flush.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c index ae7b575..fe182b6 100644 --- a/src/gallium/drivers/r300/r300_flush.c +++ b/src/gallium/drivers/r300/r300_flush.c @@ -43,14 +43,6 @@ static void r300_flush(struct pipe_context* pipe, u_upload_flush(r300->upload_vb); u_upload_flush(r300->upload_ib); - /* We probably need to flush Draw, but we may have been called from - * within Draw. This feels kludgy, but it might be the best thing. - * - * Of course, the best thing is to kill Draw with fire. :3 */ - if (r300->draw && !r300->draw->flushing) { - draw_flush(r300->draw); - } - if (r300->dirty_hw) { r300_emit_hyperz_end(r300); r300_emit_query_end(r300); |