diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-08-18 14:37:47 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-08-18 14:37:47 +0200 |
| commit | 3e54d63429fe7ca5db3c75c181abbaf7a7f55724 (patch) | |
| tree | e129c36aaef712525f0a04fc5b06c445e3cf84df /src/gallium/drivers/r300/r300_flush.c | |
| parent | eaab76457818fad0926b84c663440e8987e1f19f (diff) | |
| parent | 85d9bc236d6a8ff8f12cbc2150f8c3740354f573 (diff) | |
Merge remote branch 'origin/master' into nv50-compiler
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 ae7b5759e7..fe182b6615 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); |