AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Use query->last_index instead of the global brw->query.index.

Browse Source 
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@whitecape.org>
This commit is contained in:
Kenneth Graunke
2013-02-25 22:30:21 -08:00
parent ec5d502ec3
commit 90feda81de
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_context.h
-1
View File
@@ -1044,7 +1044,6 @@ struct brw_context
struct {
struct brw_query_object *obj;
drm_intel_bo *bo;
int index;
bool begin_emitted;
} query;
src/mesa/drivers/dri/i965/brw_queryobj.c
+6 -6
View File
@@ -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++;
}
/**