From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 3 Mar 2009 12:26:21 +0000 (+0000)
Subject: Merge commit 'origin/gallium-0.1'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dceb09909ea9d6eaef0334897ebed6da45db6faa;p=mesa.git

Merge commit 'origin/gallium-0.1'

Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
---

dceb09909ea9d6eaef0334897ebed6da45db6faa
diff --cc src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index dd01dc35e88,1fb4ed8ccd3..17ff61b675c
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@@ -295,7 -302,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(winsys->fence_signalled(winsys, 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;