From: Brian Paul <brianp@vmware.com>
Date: Thu, 28 Apr 2011 18:41:45 +0000 (-0600)
Subject: llvmpipe: move active_query assignment
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8cce283038bf51a03de6734523c3e9ea8c8a6f33;p=mesa.git

llvmpipe: move active_query assignment

Fixes piglit regression.
---

diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index 5700918856b..cbe06e58a78 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -1063,10 +1063,10 @@ 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");
    
+   setup->active_query = pq;
+
    if (setup->scene) {
       if (!lp_scene_bin_everywhere(setup->scene,
                                    LP_RAST_OP_BEGIN_QUERY,