lima/ppir: enable vectorize optimization

[mesa.git] / src / gallium / drivers / nouveau / nv30 / nv30_query.c

diff --git a/src/gallium/drivers/nouveau/nv30/nv30_query.c b/src/gallium/drivers/nouveau/nv30/nv30_query.c
index aa9a12fe3bd72c71a3137df44c618f29ca0944aa..5a0c49e2ce3b11dbe692b3a17f62f2cb6ab52300 100644 (file)
--- a/src/gallium/drivers/nouveau/nv30/nv30_query.c
+++ b/src/gallium/drivers/nouveau/nv30/nv30_query.c
@@ -121,6 +121,7 @@ nv30_query_create(struct pipe_context *pipe, unsigned type, unsigned index)
       break;
    case PIPE_QUERY_OCCLUSION_COUNTER:
    case PIPE_QUERY_OCCLUSION_PREDICATE:
+   case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE:
       q->enable = NV30_3D_QUERY_ENABLE;
       q->report = 1;
       break;
@@ -145,7 +146,7 @@ nv30_query_destroy(struct pipe_context *pipe, struct pipe_query *pq)
    FREE(pq);
 }
 
-static boolean
+static bool
 nv30_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
 {
    struct nv30_context *nv30 = nv30_context(pipe);
@@ -197,9 +198,9 @@ nv30_query_end(struct pipe_context *pipe, struct pipe_query *pq)
    return true;
 }
 
-static boolean
+static bool
 nv30_query_result(struct pipe_context *pipe, struct pipe_query *pq,
-                  boolean wait, union pipe_query_result *result)
+                  bool wait, union pipe_query_result *result)
 {
    struct nv30_screen *screen = nv30_screen(pipe->screen);
    struct nv30_query *q = nv30_query(pq);
@@ -228,7 +229,8 @@ nv30_query_result(struct pipe_context *pipe, struct pipe_query *pq,
       nv30_query_object_del(screen, &q->qo[1]);
    }
 
-   if (q->type == PIPE_QUERY_OCCLUSION_PREDICATE)
+   if (q->type == PIPE_QUERY_OCCLUSION_PREDICATE ||
+       q->type == PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE)
       result->b = !!q->result;
    else
       result->u64 = q->result;
@@ -238,7 +240,7 @@ nv30_query_result(struct pipe_context *pipe, struct pipe_query *pq,
 static void
 nv40_query_render_condition(struct pipe_context *pipe,
                             struct pipe_query *pq,
-                            boolean condition, uint mode)
+                            bool condition, enum pipe_render_cond_flag mode)
 {
    struct nv30_context *nv30 = nv30_context(pipe);
    struct nv30_query *q = nv30_query(pq);
@@ -265,7 +267,7 @@ nv40_query_render_condition(struct pipe_context *pipe,
 }
 
 static void
-nv30_set_active_query_state(struct pipe_context *pipe, boolean enable)
+nv30_set_active_query_state(struct pipe_context *pipe, bool enable)
 {
 }