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 <jfonseca@vmware.com>
This commit is contained in:
Brian Paul
2011-04-28 07:38:53 -06:00
parent fa7a051c25
commit 284191560b
+2 -2
View File
@@ -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;
}