diff options
| author | José Fonseca <[email protected]> | 2007-11-22 10:56:09 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2007-11-22 10:56:09 +0000 |
| commit | 4541ee5343df7c3ca937e088a85ec3f62970d318 (patch) | |
| tree | 3463603bc9dd479e922fc88d960f6fe16da460bc /src/mesa/pipe/i915simple/i915_winsys.h | |
| parent | 2112191d452bd76d99ca48f8da17bb49eca595aa (diff) | |
Remove fences from the i915simple winsys interface.
Fences will be part of the pipe winsys interface, so remove this to avoid
merge conflicts later on.
This reverts commit ca7f68a7cf25a51f382bba8c42d8c6ab7db57b5d.
This reverts commit dec60d33b2570cf2bdce72a00a1539ee93133f91.
This reverts commit 90dd0cb822f2fe14258c786e5c37da69472b7d17.
Diffstat (limited to 'src/mesa/pipe/i915simple/i915_winsys.h')
| -rw-r--r-- | src/mesa/pipe/i915simple/i915_winsys.h | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/mesa/pipe/i915simple/i915_winsys.h b/src/mesa/pipe/i915simple/i915_winsys.h index 386ed745d37..2c0f335d346 100644 --- a/src/mesa/pipe/i915simple/i915_winsys.h +++ b/src/mesa/pipe/i915simple/i915_winsys.h @@ -52,7 +52,6 @@ struct pipe_buffer_handle; struct pipe_winsys; -struct pipe_fence; /** @@ -98,28 +97,8 @@ struct i915_winsys { unsigned access_flags, unsigned delta ); - /** - * Flush the batch buffer. - * - * Fence argument must point to NULL or to a previous fence, and the caller - * must call fence_reference when done with the fence. - */ - void (*batch_flush)( struct i915_winsys *sws, - struct pipe_fence **fence ); - - - /* Fence - */ - void (*fence_reference)( struct i915_winsys *sws, - struct pipe_fence **dst_fence, - struct pipe_fence *src_fence ); - - int (*fence_is_signalled)( struct i915_winsys *sws, - struct pipe_fence *fence ); - - int (*fence_wait)( struct i915_winsys *sws, - struct pipe_fence *fence ); - + void (*batch_flush)( struct i915_winsys *sws ); + void (*batch_finish)( struct i915_winsys *sws ); }; #define I915_BUFFER_ACCESS_WRITE 0x1 |