[Mesa-dev] [PATCH v2 3/5] nv50: add PIPE_QUERY_OCCLUSION_PREDICATE support

[Samuel Pitoiset]

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

On 02/07/2016 02:53 AM, Ilia Mirkin wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
>
> v1 -> v2: adjust begin/end methods as well
> ---
>
> Tested this time around.
>
>   src/gallium/drivers/nouveau/nv50/nv50_query_hw.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c
> index cccd3b7..727b509 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c
> @@ -156,6 +156,7 @@ nv50_hw_begin_query(struct nv50_context *nv50, struct nv50_query *q)
>
>      switch (q->type) {
>      case PIPE_QUERY_OCCLUSION_COUNTER:
> +   case PIPE_QUERY_OCCLUSION_PREDICATE:
>         hq->nesting = nv50->screen->num_occlusion_queries_active++;
>         if (hq->nesting) {
>            nv50_hw_query_get(push, q, 0x10, 0x0100f002);
> @@ -213,6 +214,7 @@ nv50_hw_end_query(struct nv50_context *nv50, struct nv50_query *q)
>
>      switch (q->type) {
>      case PIPE_QUERY_OCCLUSION_COUNTER:
> +   case PIPE_QUERY_OCCLUSION_PREDICATE:
>         nv50_hw_query_get(push, q, 0, 0x0100f002);
>         if (--nv50->screen->num_occlusion_queries_active == 0) {
>            PUSH_SPACE(push, 2);
> @@ -304,6 +306,9 @@ nv50_hw_get_query_result(struct nv50_context *nv50, struct nv50_query *q,
>      case PIPE_QUERY_OCCLUSION_COUNTER: /* u32 sequence, u32 count, u64 time */
>         res64[0] = hq->data[1] - hq->data[5];
>         break;
> +   case PIPE_QUERY_OCCLUSION_PREDICATE:
> +      res8[0] = hq->data[1] != hq->data[5];
> +      break;
>      case PIPE_QUERY_PRIMITIVES_GENERATED: /* u64 count, u64 time */
>      case PIPE_QUERY_PRIMITIVES_EMITTED: /* u64 count, u64 time */
>         res64[0] = data64[0] - data64[2];
> @@ -372,6 +377,7 @@ nv50_hw_create_query(struct nv50_context *nv50, unsigned type, unsigned index)
>
>      switch (q->type) {
>      case PIPE_QUERY_OCCLUSION_COUNTER:
> +   case PIPE_QUERY_OCCLUSION_PREDICATE:
>         hq->rotate = 32;
>         break;
>      case PIPE_QUERY_PRIMITIVES_GENERATED:
>