Import Mesa 13.0.2

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/mesa/src/gallium/drivers/freedreno/freedreno_query.c b/lib/mesa/src/gallium/drivers/freedreno/freedreno_query.c
index b87e82507..18e0c793c 100644
--- a/lib/mesa/src/gallium/drivers/freedreno/freedreno_query.c
+++ b/lib/mesa/src/gallium/drivers/freedreno/freedreno_query.c
@@ -66,11 +66,12 @@ fd_begin_query(struct pipe_context *pctx, struct pipe_query *pq)
 	return q->funcs->begin_query(fd_context(pctx), q);
 }
 
-static void
+static bool
 fd_end_query(struct pipe_context *pctx, struct pipe_query *pq)
 {
 	struct fd_query *q = fd_query(pq);
 	q->funcs->end_query(fd_context(pctx), q);
+	return true;
 }
 
 static boolean
@@ -114,6 +115,11 @@ fd_get_driver_query_info(struct pipe_screen *pscreen,
 	return 1;
 }
 
+static void
+fd_set_active_query_state(struct pipe_context *pipe, boolean enable)
+{
+}
+
 void
 fd_query_screen_init(struct pipe_screen *pscreen)
 {
@@ -128,5 +134,6 @@ fd_query_context_init(struct pipe_context *pctx)
 	pctx->begin_query = fd_begin_query;
 	pctx->end_query = fd_end_query;
 	pctx->get_query_result = fd_get_query_result;
+	pctx->set_active_query_state = fd_set_active_query_state;
 	pctx->render_condition = fd_render_condition;
 }