[Mesa-dev] [PATCH 06/10] i965: Use query->last_index instead of the global brw->query.index.

[Kenneth Graunke]

Since we already have an index in the brw_query_object, there's no need
to also keep a global variable that shadows it.

Plus, if we ever add support for more types of queries that still need
the per-batch before/after treatment we do for occlusion queries, we
won't be able to use a single global variable.  In contrast, per-query
object variables will work fine.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 src/mesa/drivers/dri/i965/brw_context.h  |  1 -
 src/mesa/drivers/dri/i965/brw_queryobj.c | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index b8a017d..32d17a3 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1044,7 +1044,6 @@ struct brw_context
    struct {
       struct brw_query_object *obj;
       drm_intel_bo *bo;
-      int index;
       bool begin_emitted;
    } query;
 
diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c
index c520f7b..9a366c3 100644
--- a/src/mesa/drivers/dri/i965/brw_queryobj.c
+++ b/src/mesa/drivers/dri/i965/brw_queryobj.c
@@ -531,7 +531,7 @@ brw_emit_query_begin(struct brw_context *brw)
     * buffer's results momentarily.
     */
    if (brw->query.bo == NULL ||
-       brw->query.index * 2 + 1 >= 4096 / sizeof(uint64_t)) {
+       query->last_index * 2 + 1 >= 4096 / sizeof(uint64_t)) {
       drm_intel_bo_unreference(brw->query.bo);
       brw->query.bo = NULL;
 
@@ -542,10 +542,10 @@ brw_emit_query_begin(struct brw_context *brw)
       memset((char *)brw->query.bo->virtual, 0, 4096);
       drm_intel_bo_unmap(brw->query.bo);
 
-      brw->query.index = 0;
+      query->last_index = 0;
    }
 
-   write_depth_count(intel, brw->query.bo, brw->query.index * 2);
+   write_depth_count(intel, brw->query.bo, query->last_index * 2);
 
    if (query->bo != brw->query.bo) {
       if (query->bo != NULL) {
@@ -558,7 +558,6 @@ brw_emit_query_begin(struct brw_context *brw)
       drm_intel_bo_reference(brw->query.bo);
       query->bo = brw->query.bo;
    }
-   query->last_index = brw->query.index;
    brw->query.begin_emitted = true;
 }
 
@@ -571,14 +570,15 @@ void
 brw_emit_query_end(struct brw_context *brw)
 {
    struct intel_context *intel = &brw->intel;
+   struct brw_query_object *query = brw->query.obj;
 
    if (!brw->query.begin_emitted)
       return;
 
-   write_depth_count(intel, brw->query.bo, brw->query.index * 2 + 1);
+   write_depth_count(intel, brw->query.bo, query->last_index * 2 + 1);
 
    brw->query.begin_emitted = false;
-   brw->query.index++;
+   query->last_index++;
 }
 
 /**
-- 
1.8.1.4