diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-11-07 17:16:47 -0700 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-11-07 17:16:47 -0700 |
| commit | 3fe055ec9218a8745d9a53f75f4abd4760fcce28 (patch) | |
| tree | 3418e9b0ae67dbdd85a4e00783aec5f3785c4bd5 /src/mesa/pipe/i915simple | |
| parent | ae44a81d1bd40852a7cea9b8025dfa3821adc785 (diff) | |
Remove winsys->wait_idle(), subsumed by pipe->flush().
Connect intel_i915_batch_finish() into i915_winsys, just like intel_i915_batch_flush().
Call i915_winsys->batch_finish() in response to pipe->flush(PIPE_FLUSH_WAIT).
Now all the batchbuffer/fence code is in one place and a little cleaner.
Diffstat (limited to 'src/mesa/pipe/i915simple')
| -rw-r--r-- | src/mesa/pipe/i915simple/i915_flush.c | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/i915simple/i915_winsys.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/pipe/i915simple/i915_flush.c b/src/mesa/pipe/i915simple/i915_flush.c index 5a80ed5e2f..51cf9960aa 100644 --- a/src/mesa/pipe/i915simple/i915_flush.c +++ b/src/mesa/pipe/i915simple/i915_flush.c @@ -69,7 +69,7 @@ static void i915_flush( struct pipe_context *pipe, FLUSH_BATCH(); if (flags & PIPE_FLUSH_WAIT) { - i915->pipe.winsys->wait_idle(i915->pipe.winsys, i915->pipe.private); + i915->winsys->batch_finish(i915->winsys); } } diff --git a/src/mesa/pipe/i915simple/i915_winsys.h b/src/mesa/pipe/i915simple/i915_winsys.h index cbb851a932..2c0f335d34 100644 --- a/src/mesa/pipe/i915simple/i915_winsys.h +++ b/src/mesa/pipe/i915simple/i915_winsys.h @@ -98,6 +98,7 @@ struct i915_winsys { unsigned delta ); void (*batch_flush)( struct i915_winsys *sws ); + void (*batch_finish)( struct i915_winsys *sws ); }; #define I915_BUFFER_ACCESS_WRITE 0x1 |