From: Chris Wilson Date: Thu, 23 Nov 2017 09:57:08 +0000 (+0000) Subject: i965: Allow old begin/end queryobj for gen4/5 with HW contexts X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a68873f668acf70fc8c5158d3aafc63838efa697;p=mesa.git i965: Allow old begin/end queryobj for gen4/5 with HW contexts Since we have HW contexts on gen4/5, we could take advantage of them, as done for gen6+ in commit e32cd5ffbb72 ("i965: Rely on hardware contexts for query objects on Gen6+."), to only emit a pair of counters at begin/end queryobj, rather than around every primitive. However, to keep queryobj working in the meantime as we bringup support for HW ctx on gen4/5, we can keep using the existing code. References: e32cd5ffbb72 ("i965: Rely on hardware contexts for query objects on Gen6+.") Cc: Kenneth Graunke Reviewed-by: Ian Romanick --- diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c index bd3f5738eba..f667f55b6bf 100644 --- a/src/mesa/drivers/dri/i965/brw_queryobj.c +++ b/src/mesa/drivers/dri/i965/brw_queryobj.c @@ -480,9 +480,6 @@ brw_emit_query_begin(struct brw_context *brw) struct gl_context *ctx = &brw->ctx; struct brw_query_object *query = brw->query.obj; - if (brw->hw_ctx) - return; - /* Skip if we're not doing any queries, or we've already recorded the * initial query value for this batchbuffer. */ @@ -507,9 +504,6 @@ brw_emit_query_end(struct brw_context *brw) { struct brw_query_object *query = brw->query.obj; - if (brw->hw_ctx) - return; - if (!brw->query.begin_emitted) return;