diff options
| author | José Fonseca <[email protected]> | 2009-03-03 12:26:21 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2009-03-03 12:26:21 +0000 |
| commit | dceb09909ea9d6eaef0334897ebed6da45db6faa (patch) | |
| tree | dcaa2385ae077c77e3be992cd9c83598591577f4 /src/gallium/auxiliary | |
| parent | efcea15aaaaa4f1431a8c0a8521bd42a953f2e6c (diff) | |
| parent | 9036e0d724dcefb7e15d9cc2020a25f87c93a04d (diff) | |
Merge commit 'origin/gallium-0.1'
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c index dd01dc35e88..17ff61b675c 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c +++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c @@ -295,7 +295,7 @@ fenced_buffer_map(struct pb_buffer *buf, ((fenced_buf->flags & PIPE_BUFFER_USAGE_GPU_READ) && (flags & PIPE_BUFFER_USAGE_CPU_WRITE))) { if(flags & PIPE_BUFFER_USAGE_DONTBLOCK) { /* Don't wait for the GPU to finish writing */ - if(ops->fence_finish(ops, fenced_buf->fence, 0) == 0) + if(ops->fence_signalled(ops, fenced_buf->fence, 0) == 0) _fenced_buffer_remove(fenced_list, fenced_buf); else return NULL; |