[Mesa-dev] [PATCH] i965: Implement ARB_pipeline_statistics_query tessellation counters.

[Ben Widawsky]

On Mon, Nov 09, 2015 at 11:59:43PM -0800, Kenneth Graunke wrote:
> We basically just need to uncomment Ben's code.
> 
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> ---
>  src/mesa/drivers/dri/i965/gen6_queryobj.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c b/src/mesa/drivers/dri/i965/gen6_queryobj.c
> index 9f4a5db..69c514d 100644
> --- a/src/mesa/drivers/dri/i965/gen6_queryobj.c
> +++ b/src/mesa/drivers/dri/i965/gen6_queryobj.c
> @@ -136,8 +136,8 @@ emit_pipeline_stat(struct brw_context *brw, drm_intel_bo *bo,
>        IA_VERTICES_COUNT,   /* VERTICES_SUBMITTED */
>        IA_PRIMITIVES_COUNT, /* PRIMITIVES_SUBMITTED */
>        VS_INVOCATION_COUNT, /* VERTEX_SHADER_INVOCATIONS */
> -      0, /* HS_INVOCATION_COUNT,*/  /* TESS_CONTROL_SHADER_PATCHES */
> -      0, /* DS_INVOCATION_COUNT,*/  /* TESS_EVALUATION_SHADER_INVOCATIONS */
> +      HS_INVOCATION_COUNT, /* TESS_CONTROL_SHADER_PATCHES */
> +      DS_INVOCATION_COUNT, /* TESS_EVALUATION_SHADER_INVOCATIONS */
>        GS_PRIMITIVES_COUNT, /* GEOMETRY_SHADER_PRIMITIVES_EMITTED */
>        PS_INVOCATION_COUNT, /* FRAGMENT_SHADER_INVOCATIONS */
>        CS_INVOCATION_COUNT, /* COMPUTE_SHADER_INVOCATIONS */
> @@ -329,11 +329,11 @@ gen6_begin_query(struct gl_context *ctx, struct gl_query_object *q)
>     case GL_CLIPPING_INPUT_PRIMITIVES_ARB:
>     case GL_CLIPPING_OUTPUT_PRIMITIVES_ARB:
>     case GL_COMPUTE_SHADER_INVOCATIONS_ARB:
> +   case GL_TESS_CONTROL_SHADER_PATCHES_ARB:
> +   case GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB:
>        emit_pipeline_stat(brw, query->bo, query->Base.Stream, query->Base.Target, 0);
>        break;
>  
> -   case GL_TESS_CONTROL_SHADER_PATCHES_ARB:
> -   case GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB:
>     default:
>        unreachable("Unrecognized query target in brw_begin_query()");
>     }

Shouldn't there be a hunk for this in gen6_queryobj_get_results()?

BTW, I didn't see a piglit test on the list for this. I wouldn't mind doing it
to learn a bit more about tess, if that's okay with you. (It may take a while
before I actually get around to doing it).