[Mesa-dev] [PATCH 1/2] i965: Allow old begin/end queryobj for gen4/5 with HW contexts

[Ian Romanick]

Yeah... since the split of Gen4/5 and Gen6+, those checks seem vestigial
anyway.  This patch is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 11/23/2017 02:24 AM, Chris Wilson wrote:
> 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 <kenneth at whitecape.org>
> ---
>  src/mesa/drivers/dri/i965/brw_queryobj.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c
> index bd3f5738eb..f667f55b6b 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;
>  
>