Merge remote-tracking branch 'origin/master' into pipe-video

1 files changed, 3 insertions, 4 deletions

diff --git a/src/gallium/drivers/softpipe/sp_fence.c b/src/gallium/drivers/softpipe/sp_fence.c
index 7b79a0df4ea..c2897ed1ef8 100644
--- a/src/gallium/drivers/softpipe/sp_fence.c
+++ b/src/gallium/drivers/softpipe/sp_fence.c
@@ -36,8 +36,7 @@ softpipe_fence_reference(struct pipe_screen *screen,
                          struct pipe_fence_handle **ptr,
                          struct pipe_fence_handle *fence)
 {
-   assert(!*ptr);
-   assert(!fence);
+   *ptr = fence;
 }
 
 
@@ -45,7 +44,7 @@ static boolean
 softpipe_fence_signalled(struct pipe_screen *screen,
                          struct pipe_fence_handle *fence)
 {
-   assert(!fence);
+   assert(fence);
    return TRUE;
 }
 
@@ -55,7 +54,7 @@ softpipe_fence_finish(struct pipe_screen *screen,
                       struct pipe_fence_handle *fence,
                       uint64_t timeout)
 {
-   assert(!fence);
+   assert(fence);
    return TRUE;
 }