r600g: remove useless texture barrier

[mesa.git] / src / gallium / drivers / r600 / r600_query.c

diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c
index bedb48b6031a1a1b64454af6d14030e372ba4e3e..afdb0382d37fe43c6afb2eb02bb89d68ae2ca887 100644 (file)
--- a/src/gallium/drivers/r600/r600_query.c
+++ b/src/gallium/drivers/r600/r600_query.c
@@ -43,15 +43,18 @@ static void r600_begin_query(struct pipe_context *ctx, struct pipe_query *query)
        struct r600_query *rquery = (struct r600_query *)query;
 
        rquery->result = 0;
-       rquery->num_results = 0;
+       rquery->results_start = rquery->results_end;
        r600_query_begin(&rctx->ctx, (struct r600_query *)query);
+       LIST_ADDTAIL(&rquery->list, &rctx->ctx.active_query_list);
 }
 
 static void r600_end_query(struct pipe_context *ctx, struct pipe_query *query)
 {
        struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
+       struct r600_query *rquery = (struct r600_query *)query;
 
-       r600_query_end(&rctx->ctx, (struct r600_query *)query);
+       r600_query_end(&rctx->ctx, rquery);
+       LIST_DELINIT(&rquery->list);
 }
 
 static boolean r600_get_query_result(struct pipe_context *ctx,
@@ -61,10 +64,7 @@ static boolean r600_get_query_result(struct pipe_context *ctx,
        struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
        struct r600_query *rquery = (struct r600_query *)query;
 
-       if (rquery->num_results) {
-                ctx->flush(ctx, NULL);
-       }
-       return r600_context_query_result(&rctx->ctx, (struct r600_query *)query, wait, vresult);
+       return r600_context_query_result(&rctx->ctx, rquery, wait, vresult);
 }
 
 static void r600_render_condition(struct pipe_context *ctx,
@@ -75,12 +75,22 @@ static void r600_render_condition(struct pipe_context *ctx,
        struct r600_query *rquery = (struct r600_query *)query;
        int wait_flag = 0;
 
+       /* If we already have nonzero result, render unconditionally */
+       if (query != NULL && rquery->result != 0) {
+               if (rctx->current_render_cond) {
+                       r600_render_condition(ctx, NULL, 0);
+               }
+               return;
+       }
+
        rctx->current_render_cond = query;
        rctx->current_render_cond_mode = mode;
 
-       if (!query) {
-               rctx->ctx.predicate_drawing = false;
-               r600_query_predication(&rctx->ctx, NULL, PREDICATION_OP_CLEAR, 1);
+       if (query == NULL) {
+               if (rctx->ctx.predicate_drawing) {
+                       rctx->ctx.predicate_drawing = false;
+                       r600_query_predication(&rctx->ctx, NULL, PREDICATION_OP_CLEAR, 1);
+               }
                return;
        }
 
@@ -91,7 +101,6 @@ static void r600_render_condition(struct pipe_context *ctx,
 
        rctx->ctx.predicate_drawing = true;
        r600_query_predication(&rctx->ctx, rquery, PREDICATION_OP_ZPASS, wait_flag);
-       
 }
 
 void r600_init_query_functions(struct r600_pipe_context *rctx)
@@ -102,6 +111,6 @@ void r600_init_query_functions(struct r600_pipe_context *rctx)
        rctx->context.end_query = r600_end_query;
        rctx->context.get_query_result = r600_get_query_result;
 
-       if (r600_get_num_backends(rctx->screen->radeon) > 0)
+       if (rctx->screen->info.r600_num_backends > 0)
            rctx->context.render_condition = r600_render_condition;
 }