From 0ca5b1a6b98aadf5fbec141be543828fbdf98adb Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 22 Feb 2021 07:57:21 -0800 Subject: [PATCH] etnaviv: Drop foreach_bit() macro Now that we have a global one. Signed-off-by: Rob Clark Reviewed-By: Mike Blumenkrantz Part-of: --- src/gallium/drivers/etnaviv/etnaviv_context.c | 6 +++--- src/gallium/drivers/etnaviv/etnaviv_util.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c index 90cd0ea87f2..6589f033d92 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_context.c +++ b/src/gallium/drivers/etnaviv/etnaviv_context.c @@ -344,14 +344,14 @@ etna_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info, } /* Mark constant buffers as being read */ - foreach_bit(i, ctx->constant_buffer[PIPE_SHADER_VERTEX].enabled_mask) + u_foreach_bit(i, ctx->constant_buffer[PIPE_SHADER_VERTEX].enabled_mask) resource_read(ctx, ctx->constant_buffer[PIPE_SHADER_VERTEX].cb[i].buffer); - foreach_bit(i, ctx->constant_buffer[PIPE_SHADER_FRAGMENT].enabled_mask) + u_foreach_bit(i, ctx->constant_buffer[PIPE_SHADER_FRAGMENT].enabled_mask) resource_read(ctx, ctx->constant_buffer[PIPE_SHADER_FRAGMENT].cb[i].buffer); /* Mark VBOs as being read */ - foreach_bit(i, ctx->vertex_buffer.enabled_mask) { + u_foreach_bit(i, ctx->vertex_buffer.enabled_mask) { assert(!ctx->vertex_buffer.vb[i].is_user_buffer); resource_read(ctx, ctx->vertex_buffer.vb[i].buffer.resource); } diff --git a/src/gallium/drivers/etnaviv/etnaviv_util.h b/src/gallium/drivers/etnaviv/etnaviv_util.h index d5b4dc963ca..43091d7ed02 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_util.h +++ b/src/gallium/drivers/etnaviv/etnaviv_util.h @@ -30,9 +30,6 @@ /* for conditionally setting boolean flag(s): */ #define COND(bool, val) ((bool) ? (val) : 0) -#define foreach_bit(b, mask) \ - for (uint32_t _m = (mask); _m && ({(b) = u_bit_scan(&_m); 1;});) - /* align to a value divisable by granularity >= value, works only for powers of two */ static inline uint32_t etna_align_up(uint32_t value, uint32_t granularity)