From: Nicolai Hähnle Date: Thu, 20 Sep 2018 08:21:26 +0000 (+0200) Subject: radeonsi: const-ify the si_query_ops X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d73a25f2c0ae64e208a1511c785e35f5d74f4cd6;p=mesa.git radeonsi: const-ify the si_query_ops Reviewed-by: Marek Olšák --- diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c index 65197c0daa4..fc2c58854bc 100644 --- a/src/gallium/drivers/radeonsi/si_perfcounter.c +++ b/src/gallium/drivers/radeonsi/si_perfcounter.c @@ -915,7 +915,7 @@ static bool si_pc_query_get_result(struct si_context *sctx, struct si_query *rqu return true; } -static struct si_query_ops batch_query_ops = { +static const struct si_query_ops batch_query_ops = { .destroy = si_pc_query_destroy, .begin = si_pc_query_begin, .end = si_pc_query_end, diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c index 5b0fba0ed92..093643bf684 100644 --- a/src/gallium/drivers/radeonsi/si_query.c +++ b/src/gallium/drivers/radeonsi/si_query.c @@ -34,7 +34,7 @@ #define SI_MAX_STREAMS 4 -static struct si_query_ops query_hw_ops; +static const struct si_query_ops query_hw_ops; struct si_hw_query_params { unsigned start_offset; @@ -499,7 +499,7 @@ static bool si_query_sw_get_result(struct si_context *sctx, } -static struct si_query_ops sw_query_ops = { +static const struct si_query_ops sw_query_ops = { .destroy = si_query_sw_destroy, .begin = si_query_sw_begin, .end = si_query_sw_end, @@ -1343,7 +1343,7 @@ void si_query_hw_resume(struct si_context *sctx, struct si_query *query) si_query_hw_emit_start(sctx, (struct si_query_hw *)query); } -static struct si_query_ops query_hw_ops = { +static const struct si_query_ops query_hw_ops = { .destroy = si_query_hw_destroy, .begin = si_query_hw_begin, .end = si_query_hw_end, diff --git a/src/gallium/drivers/radeonsi/si_query.h b/src/gallium/drivers/radeonsi/si_query.h index 63af760a271..0bc1d56f78a 100644 --- a/src/gallium/drivers/radeonsi/si_query.h +++ b/src/gallium/drivers/radeonsi/si_query.h @@ -141,7 +141,7 @@ struct si_query_ops { struct si_query { struct threaded_query b; - struct si_query_ops *ops; + const struct si_query_ops *ops; /* The PIPE_QUERY_xxx type of query */ unsigned type;