summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Richter <[email protected]>2017-06-07 14:40:23 +0200
committerBrian Paul <[email protected]>2017-08-16 18:32:41 -0600
commit496a691e3544d082670ac1f33059692510a2a86d (patch)
tree1f4cd253e32ccd4819b7e5d9a99497c14825e6e3
parent27fb0899f7a6ebe2e8d06ec82831594a03e61445 (diff)
st/mesa: fix a null pointer access
Fixes crash with llvmpipe on Windows. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102148 Cc: [email protected] Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/mesa/state_tracker/st_manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index 617a691a67c..07c430dca45 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -634,7 +634,7 @@ st_context_flush(struct st_context_iface *stctxi, unsigned flags,
st_flush(st, fence, pipe_flags);
- if ((flags & ST_FLUSH_WAIT) && fence) {
+ if ((flags & ST_FLUSH_WAIT) && fence && *fence) {
st->pipe->screen->fence_finish(st->pipe->screen, NULL, *fence,
PIPE_TIMEOUT_INFINITE);
st->pipe->screen->fence_reference(st->pipe->screen, fence, NULL);