diff options
| author | Christian König <[email protected]> | 2010-11-11 21:07:42 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-11-11 21:07:42 +0100 |
| commit | 195bbe8ce218533569dde1368d04da0fd229913d (patch) | |
| tree | 29d3db04673f59dcfd6663c524a5c1343d5cbee6 /src/gallium/drivers/llvmpipe/lp_rast.c | |
| parent | 99b57bc20e839043ec6160502814085a0976fccc (diff) | |
| parent | d67df5dd9db1cede92f1b177c890f83809bb4582 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_rast.c')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_rast.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c b/src/gallium/drivers/llvmpipe/lp_rast.c index d358a983943..decf3bd4499 100644 --- a/src/gallium/drivers/llvmpipe/lp_rast.c +++ b/src/gallium/drivers/llvmpipe/lp_rast.c @@ -485,8 +485,11 @@ static void lp_rast_end_query(struct lp_rasterizer_task *task, const union lp_rast_cmd_arg arg) { - task->query->count[task->thread_index] += task->vis_counter; - task->query = NULL; + assert(task->query); + if (task->query) { + task->query->count[task->thread_index] += task->vis_counter; + task->query = NULL; + } } |