lima/ppir: enable vectorize optimization

[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 92f243b5c9a7a5a80e4897ce6f52dc981679b839..0a41ac81384b21834ebd7c53474c132bbaf950a7 100644 (file)
--- a/src/gallium/drivers/r600/r600_query.c
+++ b/src/gallium/drivers/r600/r600_query.c
@@ -994,8 +994,8 @@ static void r600_destroy_query(struct pipe_context *ctx, struct pipe_query *quer
        rquery->ops->destroy(rctx->screen, rquery);
 }
 
-static boolean r600_begin_query(struct pipe_context *ctx,
-                                struct pipe_query *query)
+static bool r600_begin_query(struct pipe_context *ctx,
+                            struct pipe_query *query)
 {
        struct r600_common_context *rctx = (struct r600_common_context *)ctx;
        struct r600_query *rquery = (struct r600_query *)query;
@@ -1294,9 +1294,9 @@ static void r600_query_hw_add_result(struct r600_common_screen *rscreen,
        }
 }
 
-static boolean r600_get_query_result(struct pipe_context *ctx,
-                                    struct pipe_query *query, boolean wait,
-                                    union pipe_query_result *result)
+static bool r600_get_query_result(struct pipe_context *ctx,
+                                 struct pipe_query *query, bool wait,
+                                 union pipe_query_result *result)
 {
        struct r600_common_context *rctx = (struct r600_common_context *)ctx;
        struct r600_query *rquery = (struct r600_query *)query;
@@ -1306,7 +1306,7 @@ static boolean r600_get_query_result(struct pipe_context *ctx,
 
 static void r600_get_query_result_resource(struct pipe_context *ctx,
                                            struct pipe_query *query,
-                                           boolean wait,
+                                           bool wait,
                                            enum pipe_query_value_type result_type,
                                            int index,
                                            struct pipe_resource *resource,
@@ -1594,7 +1594,7 @@ static void r600_restore_qbo_state(struct r600_common_context *rctx,
        rctx->b.set_constant_buffer(&rctx->b, PIPE_SHADER_COMPUTE, 0, &st->saved_const0);
        pipe_resource_reference(&st->saved_const0.buffer, NULL);
 
-       rctx->b.set_shader_buffers(&rctx->b, PIPE_SHADER_COMPUTE, 0, 3, st->saved_ssbo);
+       rctx->b.set_shader_buffers(&rctx->b, PIPE_SHADER_COMPUTE, 0, 3, st->saved_ssbo, ~0);
        for (unsigned i = 0; i < 3; ++i)
                pipe_resource_reference(&st->saved_ssbo[i].buffer, NULL);
 }
@@ -1728,7 +1728,7 @@ static void r600_query_hw_get_result_resource(struct r600_common_context *rctx,
 
                rctx->b.set_constant_buffer(&rctx->b, PIPE_SHADER_COMPUTE, 0, &constant_buffer);
 
-               rctx->b.set_shader_buffers(&rctx->b, PIPE_SHADER_COMPUTE, 0, 3, ssbo);
+               rctx->b.set_shader_buffers(&rctx->b, PIPE_SHADER_COMPUTE, 0, 3, ssbo, ~0);
 
                if (wait && qbuf == &query->buffer) {
                        uint64_t va;
@@ -1753,7 +1753,7 @@ static void r600_query_hw_get_result_resource(struct r600_common_context *rctx,
 
 static void r600_render_condition(struct pipe_context *ctx,
                                  struct pipe_query *query,
-                                 boolean condition,
+                                 bool condition,
                                  enum pipe_render_cond_flag mode)
 {
        struct r600_common_context *rctx = (struct r600_common_context *)ctx;
@@ -2031,7 +2031,7 @@ static const struct pipe_driver_query_info r600_driver_query_list[] = {
 
 static unsigned r600_get_num_queries(struct r600_common_screen *rscreen)
 {
-       if (rscreen->info.drm_major == 2 && rscreen->info.drm_minor >= 42)
+       if (rscreen->info.drm_minor >= 42)
                return ARRAY_SIZE(r600_driver_query_list);
        else
                return ARRAY_SIZE(r600_driver_query_list) - 25;