[Mesa-dev] [PATCH] nv50, nvc0: Mark PIPE_QUERY_TIMESTAMP_DISJOINT as ready immediately on end because it is not issued on the gpu

[Tiziano Bacocco]

Signed-off-by: Tiziano Bacocco <tizbac2 at gmail.com>
---
 src/gallium/drivers/nouveau/nv50/nv50_query.c | 1 +
 src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query.c b/src/gallium/drivers/nouveau/nv50/nv50_query.c
index e0671ce..ae6e3a3 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_query.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_query.c
@@ -231,6 +231,7 @@ nv50_query_end(struct pipe_context *pipe, struct pipe_query *pq)
       nv50_query_get(push, q, 0, 0x0d005002 | (q->index << 5));
       break;
    case PIPE_QUERY_TIMESTAMP_DISJOINT:
+      q->ready = TRUE;
       break;
    default:
       assert(0);
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
index 3a6df9d..5d10d68 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
@@ -397,6 +397,9 @@ nvc0_query_end(struct pipe_context *pipe, struct pipe_query *pq)
       /* indexed by TFB buffer instead of by vertex stream */
       nvc0_query_get(push, q, 0x00, 0x0d005002 | (q->index << 5));
       break;
+   case PIPE_QUERY_TIMESTAMP_DISJOINT:
+      q->state = NVC0_QUERY_STATE_READY; /* This query is not issued on GPU because disjoint is forced to FALSE */
+      break;
    default:
 #ifdef NOUVEAU_ENABLE_DRIVER_STATISTICS
       if (q->type >= NVC0_QUERY_DRV_STAT(0) &&
-- 
2.1.0