diff options
| author | Marek Olšák <maraeo@gmail.com> | 2010-06-12 23:45:02 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2010-06-13 17:43:38 +0200 |
| commit | 7ca24dfa6daead4722d03d9a947f1e049b9c7d38 (patch) | |
| tree | c51546ed9aa6ad815a04d0ecc136eba913d02d3d | |
| parent | 98f67a6bbd19474b1fc4816325ba23d5560ae698 (diff) | |
r300g: inline FLUSH_CS
The fewer macros, the better.
| -rw-r--r-- | src/gallium/drivers/r300/r300_cs.h | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_flush.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/gallium/drivers/r300/r300_cs.h b/src/gallium/drivers/r300/r300_cs.h index e4b76319e1..1cdd4b82ca 100644 --- a/src/gallium/drivers/r300/r300_cs.h +++ b/src/gallium/drivers/r300/r300_cs.h @@ -58,13 +58,6 @@ cs_winsys->end_cs(cs_winsys, __FILE__, __FUNCTION__, __LINE__); \ } while (0) -#define FLUSH_CS do { \ - if (SCREEN_DBG_ON(r300->screen, DBG_STATS)) { \ - r300->flush_counter++; \ - } \ - cs_winsys->flush_cs(cs_winsys); \ -} while (0) - /** * Writing pure DWORDs. diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c index 360b19a0c1..ba840bfff8 100644 --- a/src/gallium/drivers/r300/r300_flush.c +++ b/src/gallium/drivers/r300/r300_flush.c @@ -39,8 +39,6 @@ static void r300_flush(struct pipe_context* pipe, struct r300_atom *atom; struct r300_fence **rfence = (struct r300_fence**)fence; - CS_LOCALS(r300); - (void) cs_count; /* 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. * @@ -52,7 +50,10 @@ static void r300_flush(struct pipe_context* pipe, if (r300->dirty_hw) { r300_emit_query_end(r300); - FLUSH_CS; + if (SCREEN_DBG_ON(r300->screen, DBG_STATS)) { + r300->flush_counter++; + } + r300->rws->flush_cs(r300->rws); r300->dirty_hw = 0; /* New kitchen sink, baby. */ |