Module: Mesa
Branch: master
Commit: aaebf49ebaf34e92e99608507f42f5f42335a118
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=aaebf49ebaf34e92e99608507f42f5f42335a118

Author: Nicolai Hähnle <[email protected]>
Date:   Fri Nov 10 11:28:28 2017 +0100

gallium/u_threaded: properly initialize fence unflushed tokens

This got lost in a rebase but never hurt anything because we happened
to always sync in fence_finish anyway...

Reviewed-by: Marek Olšák <[email protected]>

---

 src/gallium/auxiliary/util/u_threaded_context.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_threaded_context.c 
b/src/gallium/auxiliary/util/u_threaded_context.c
index d0a8ffbd11..84fbb22453 100644
--- a/src/gallium/auxiliary/util/u_threaded_context.c
+++ b/src/gallium/auxiliary/util/u_threaded_context.c
@@ -1931,7 +1931,6 @@ tc_flush(struct pipe_context *_pipe, struct 
pipe_fence_handle **fence,
 
    if (async && tc->create_fence) {
       if (fence) {
-         struct tc_unflushed_batch_token *token = NULL;
          struct tc_batch *next = &tc->batch_slots[tc->next];
 
          if (!next->token) {
@@ -1943,7 +1942,7 @@ tc_flush(struct pipe_context *_pipe, struct 
pipe_fence_handle **fence,
             next->token->tc = tc;
          }
 
-         screen->fence_reference(screen, fence, tc->create_fence(pipe, token));
+         screen->fence_reference(screen, fence, tc->create_fence(pipe, 
next->token));
          if (!*fence)
             goto out_of_memory;
       }

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to