radeon: expose r600_query_hw functions for reuse

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
[Fixed a rebase conflict and re-tested before pushing.]

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index 603a0d0d5e16e24b12ecffefe89786b14c997365..079e02ee90f970d6b08d81e0531f9a75f78c23c1 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -282,12 +282,6 @@ static void r600_query_hw_prepare_buffer(struct r600_common_context *ctx,
        }
 }
 
-static boolean r600_query_hw_begin(struct r600_common_context *, struct r600_query *);
-static void r600_query_hw_end(struct r600_common_context *, struct r600_query *);
-static boolean r600_query_hw_get_result(struct r600_common_context *,
-                                       struct r600_query *, boolean wait,
-                                       union pipe_query_result *result);
-
 static struct r600_query_ops query_hw_ops = {
        .destroy = r600_query_hw_destroy,
        .begin = r600_query_hw_begin,
@@ -317,6 +311,16 @@ static struct r600_query_hw_ops query_hw_default_hw_ops = {
        .add_result = r600_query_hw_add_result,
 };
 
+boolean r600_query_hw_init(struct r600_common_context *rctx,
+                          struct r600_query_hw *query)
+{
+       query->buffer.buf = r600_new_query_buffer(rctx, query);
+       if (!query->buffer.buf)
+               return FALSE;
+
+       return TRUE;
+}
+
 static struct pipe_query *r600_query_hw_create(struct r600_common_context *rctx,
                                               unsigned query_type,
                                               unsigned index)
@@ -366,8 +370,7 @@ static struct pipe_query *r600_query_hw_create(struct r600_common_context *rctx,
                return NULL;
        }
 
-       query->buffer.buf = r600_new_query_buffer(rctx, query);
-       if (!query->buffer.buf) {
+       if (!r600_query_hw_init(rctx, query)) {
                FREE(query);
                return NULL;
        }
@@ -646,8 +649,8 @@ static boolean r600_begin_query(struct pipe_context *ctx,
        return rquery->ops->begin(rctx, rquery);
 }
 
-static boolean r600_query_hw_begin(struct r600_common_context *rctx,
-                                  struct r600_query *rquery)
+boolean r600_query_hw_begin(struct r600_common_context *rctx,
+                           struct r600_query *rquery)
 {
        struct r600_query_hw *query = (struct r600_query_hw *)rquery;
        struct r600_query_buffer *prev = query->buffer.previous;
@@ -692,7 +695,7 @@ static void r600_end_query(struct pipe_context *ctx, struct pipe_query *query)
        rquery->ops->end(rctx, rquery);
 }
 
-static void r600_query_hw_end(struct r600_common_context *rctx,
+void r600_query_hw_end(struct r600_common_context *rctx,
                              struct r600_query *rquery)
 {
        struct r600_query_hw *query = (struct r600_query_hw *)rquery;
@@ -859,9 +862,9 @@ static void r600_query_hw_clear_result(struct r600_query_hw *query,
        util_query_clear_result(result, query->b.type);
 }
 
-static boolean r600_query_hw_get_result(struct r600_common_context *rctx,
-                                       struct r600_query *rquery,
-                                       boolean wait, union pipe_query_result *result)
+boolean r600_query_hw_get_result(struct r600_common_context *rctx,
+                                struct r600_query *rquery,
+                                boolean wait, union pipe_query_result *result)
 {
        struct r600_query_hw *query = (struct r600_query_hw *)rquery;
        struct r600_query_buffer *qbuf;

diff --git a/src/gallium/drivers/radeon/r600_query.h b/src/gallium/drivers/radeon/r600_query.h
index f6dc74aa86d1950d95f0216b4d25df1f7f9b21bc..29c635ea825efdf6186d570f7e84ed62ab6398ad 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.h
+++ b/src/gallium/drivers/radeon/r600_query.h
@@ -118,7 +118,17 @@ struct r600_query_hw {
        unsigned stream;
 };
 
+boolean r600_query_hw_init(struct r600_common_context *rctx,
+                          struct r600_query_hw *query);
 void r600_query_hw_destroy(struct r600_common_context *rctx,
                           struct r600_query *rquery);
+boolean r600_query_hw_begin(struct r600_common_context *rctx,
+                           struct r600_query *rquery);
+void r600_query_hw_end(struct r600_common_context *rctx,
+                      struct r600_query *rquery);
+boolean r600_query_hw_get_result(struct r600_common_context *rctx,
+                                struct r600_query *rquery,
+                                boolean wait,
+                                union pipe_query_result *result);
 
 #endif /* R600_QUERY_H */