From: Brian Paul Date: Thu, 28 Apr 2011 13:38:53 +0000 (-0600) Subject: llvmpipe: move active_query assignment in lp_setup_begin_query() X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=284191560b191ebb2219e0f5fe2de4128ad172a5;p=mesa.git llvmpipe: move active_query assignment in lp_setup_begin_query() If we run out of bin memory and do an early return from lp_setup_begin_query() we'd omit setting the setup->active_query pointer. Then, when lp_setup_end_query() was later called, the assertion for setup->active_query == pq would fail. Moving the assigment in lp_setup_begin_query() avoids that. Reviewed-by: Jose Fonseca --- diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c index c82ab821c7e..5700918856b 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup.c +++ b/src/gallium/drivers/llvmpipe/lp_setup.c @@ -1063,6 +1063,8 @@ lp_setup_begin_query(struct lp_setup_context *setup, /* init the query to its beginning state */ assert(setup->active_query == NULL); + setup->active_query = pq; + set_scene_state(setup, SETUP_ACTIVE, "begin_query"); if (setup->scene) { @@ -1080,8 +1082,6 @@ lp_setup_begin_query(struct lp_setup_context *setup, } } } - - setup->active_query = pq; }