X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fradeonsi%2Fsi_query.c;h=8776dde452175845be520272ccbe503f990f2f76;hb=1909bc526dd0e51d49252a1fc1c2aab0a8a51fb5;hp=394bf7ff12477a79d670bc9c424134a358c182e3;hpb=792a638b032d16fbe6404f9d90c34b3e0f1fb0b5;p=mesa.git

diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c
index 394bf7ff124..8776dde4521 100644
--- a/src/gallium/drivers/radeonsi/si_query.c
+++ b/src/gallium/drivers/radeonsi/si_query.c
@@ -1013,7 +1013,7 @@ static void si_emit_query_predication(struct si_context *ctx)
 	if (!query)
 		return;
 
-	if (ctx->chip_class == GFX10 &&
+	if (ctx->screen->use_ngg_streamout &&
 	    (query->b.type == PIPE_QUERY_SO_OVERFLOW_PREDICATE ||
 	     query->b.type == PIPE_QUERY_SO_OVERFLOW_ANY_PREDICATE)) {
 		assert(!"not implemented");
@@ -1100,7 +1100,7 @@ static struct pipe_query *si_create_query(struct pipe_context *ctx, unsigned que
 	     query_type != SI_QUERY_TIME_ELAPSED_SDMA))
 		return si_query_sw_create(query_type);
 
-	if (sscreen->info.chip_class >= GFX10 &&
+	if (sscreen->use_ngg_streamout &&
 	    (query_type == PIPE_QUERY_PRIMITIVES_EMITTED ||
 	     query_type == PIPE_QUERY_PRIMITIVES_GENERATED ||
 	     query_type == PIPE_QUERY_SO_STATISTICS ||
@@ -1119,8 +1119,8 @@ static void si_destroy_query(struct pipe_context *ctx, struct pipe_query *query)
 	squery->ops->destroy(sctx, squery);
 }
 
-static boolean si_begin_query(struct pipe_context *ctx,
-                                struct pipe_query *query)
+static bool si_begin_query(struct pipe_context *ctx,
+			   struct pipe_query *query)
 {
 	struct si_context *sctx = (struct si_context *)ctx;
 	struct si_query *squery = (struct si_query *)query;
@@ -1147,7 +1147,7 @@ bool si_query_hw_begin(struct si_context *sctx,
 	if (!query->buffer.buf)
 		return false;
 
-	LIST_ADDTAIL(&query->b.active_list, &sctx->active_queries);
+	list_addtail(&query->b.active_list, &sctx->active_queries);
 	sctx->num_cs_dw_queries_suspend += query->b.num_cs_dw_suspend;
 	return true;
 }
@@ -1171,7 +1171,7 @@ bool si_query_hw_end(struct si_context *sctx,
 	si_query_hw_emit_stop(sctx, query);
 
 	if (!(query->flags & SI_QUERY_HW_FLAG_NO_START)) {
-		LIST_DELINIT(&query->b.active_list);
+		list_delinit(&query->b.active_list);
 		sctx->num_cs_dw_queries_suspend -= query->b.num_cs_dw_suspend;
 	}
 
@@ -1401,9 +1401,9 @@ static const struct si_query_ops query_hw_ops = {
 	.resume = si_query_hw_resume,
 };
 
-static boolean si_get_query_result(struct pipe_context *ctx,
-				   struct pipe_query *query, boolean wait,
-				   union pipe_query_result *result)
+static bool si_get_query_result(struct pipe_context *ctx,
+				struct pipe_query *query, bool wait,
+				union pipe_query_result *result)
 {
 	struct si_context *sctx = (struct si_context *)ctx;
 	struct si_query *squery = (struct si_query *)query;
@@ -1413,7 +1413,7 @@ static boolean si_get_query_result(struct pipe_context *ctx,
 
 static void si_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,
@@ -1625,7 +1625,7 @@ static void si_query_hw_get_result_resource(struct si_context *sctx,
 
 static void si_render_condition(struct pipe_context *ctx,
 				struct pipe_query *query,
-				boolean condition,
+				bool condition,
 				enum pipe_render_cond_flag mode)
 {
 	struct si_context *sctx = (struct si_context *)ctx;
@@ -1923,7 +1923,7 @@ void si_init_query_functions(struct si_context *sctx)
 		sctx->b.render_condition = si_render_condition;
 	}
 
-	LIST_INITHEAD(&sctx->active_queries);
+	list_inithead(&sctx->active_queries);
 }
 
 void si_init_screen_query_functions(struct si_screen *sscreen)