fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 18:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge commit 'origin/gallium-0.1'

Browse source 
Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
This commit is contained in:
José Fonseca 2009-03-03 12:26:21 +00:00
commit dceb09909e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
View file

@ -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))) { ((fenced_buf->flags & PIPE_BUFFER_USAGE_GPU_READ) && (flags & PIPE_BUFFER_USAGE_CPU_WRITE))) {
if(flags & PIPE_BUFFER_USAGE_DONTBLOCK) { if(flags & PIPE_BUFFER_USAGE_DONTBLOCK) {
/* Don't wait for the GPU to finish writing */ /* 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); _fenced_buffer_remove(fenced_list, fenced_buf);
else else
return NULL; return NULL;