Merge branch '7.8'

[mesa.git] / src / gallium / drivers / llvmpipe / lp_flush.c

diff --git a/src/gallium/drivers/llvmpipe/lp_flush.c b/src/gallium/drivers/llvmpipe/lp_flush.c
index 636d72a9bb8f0f7a80cb0a46e0cee9013c9f69c4..782669a1e773d7e9f45e81f5d9c363d1e9410cd4 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_flush.c
+++ b/src/gallium/drivers/llvmpipe/lp_flush.c
@@ -111,7 +111,6 @@ llvmpipe_flush_texture(struct pipe_context *pipe,
                        boolean cpu_access,
                        boolean do_not_flush)
 {
-   struct pipe_fence_handle *last_fence = NULL;
    unsigned referenced;
 
    referenced = pipe->is_texture_referenced(pipe, texture, face, level);
@@ -142,7 +141,7 @@ llvmpipe_flush_texture(struct pipe_context *pipe,
 
          pipe->flush(pipe, flush_flags, &fence);
 
-         if (last_fence) {
+         if (fence) {
             pipe->screen->fence_finish(pipe->screen, fence, 0);
             pipe->screen->fence_reference(pipe->screen, &fence, NULL);
          }