From: Nicolai Hähnle Date: Thu, 12 Nov 2015 11:02:44 +0000 (+0100) Subject: st/mesa: use BITSET_FOREACH_SET to loop through active perfmon counters X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=afa6121b4ef2d249004cff0bb40237c71c61946d;p=mesa.git st/mesa: use BITSET_FOREACH_SET to loop through active perfmon counters Reviewed-by: Samuel Pitoiset Tested-by: Samuel Pitoiset --- diff --git a/src/mesa/state_tracker/st_cb_perfmon.c b/src/mesa/state_tracker/st_cb_perfmon.c index 80ff1706966..ec12eb22206 100644 --- a/src/mesa/state_tracker/st_cb_perfmon.c +++ b/src/mesa/state_tracker/st_cb_perfmon.c @@ -50,6 +50,7 @@ init_perf_monitor(struct gl_context *ctx, struct gl_perf_monitor_object *m) for (gid = 0; gid < ctx->PerfMonitor.NumGroups; gid++) { const struct gl_perf_monitor_group *g = &ctx->PerfMonitor.Groups[gid]; const struct st_perf_monitor_group *stg = &st->perfmon[gid]; + BITSET_WORD tmp; if (m->ActiveGroups[gid] > g->MaxActiveCounters) { /* Maximum number of counters reached. Cannot start the session. */ @@ -60,14 +61,10 @@ init_perf_monitor(struct gl_context *ctx, struct gl_perf_monitor_object *m) return false; } - for (cid = 0; cid < g->NumCounters; cid++) { - const struct gl_perf_monitor_counter *c = &g->Counters[cid]; + BITSET_FOREACH_SET(cid, tmp, m->ActiveCounters[gid], g->NumCounters) { const struct st_perf_monitor_counter *stc = &stg->counters[cid]; struct st_perf_counter_object *cntr; - if (!BITSET_TEST(m->ActiveCounters[gid], cid)) - continue; - cntr = CALLOC_STRUCT(st_perf_counter_object); if (!cntr) return false;