From bef99f8caa4715c03bcbf2479aab7444dc401ab7 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 21 Apr 2021 15:42:37 +0200 Subject: [PATCH] zink: remove stray semicolons Sometimes, there's a surplus of semicolons, and there's enough to go around for everyone. So maybe you'll save a few away for later. But in the big pictures, it seems better to get rid of these so we don't overrun the semicolon quota. Or whatever, I'm just cleaning up here. Reviewed-By: Mike Blumenkrantz Part-of: --- src/gallium/drivers/zink/zink_context.c | 4 ++-- src/gallium/drivers/zink/zink_descriptors.c | 2 +- src/gallium/drivers/zink/zink_program.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 0d1ece048f8..46d21f695fc 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1040,7 +1040,7 @@ get_render_pass(struct zink_context *ctx) state.rts[fb->nr_cbufs].clear_stencil = zink_fb_clear_enabled(ctx, PIPE_MAX_COLOR_BUFS) && !zink_fb_clear_first_needs_explicit(fb_clear) && (zink_fb_clear_element(fb_clear, 0)->zs.bits & PIPE_CLEAR_STENCIL); - clears |= state.rts[fb->nr_cbufs].clear_color || state.rts[fb->nr_cbufs].clear_stencil ? BITFIELD_BIT(fb->nr_cbufs) : 0;; + clears |= state.rts[fb->nr_cbufs].clear_color || state.rts[fb->nr_cbufs].clear_stencil ? BITFIELD_BIT(fb->nr_cbufs) : 0; state.num_rts++; } state.have_zsbuf = fb->zsbuf != NULL; @@ -1078,7 +1078,7 @@ get_framebuffer(struct zink_context *ctx) state.num_attachments = ctx->fb_state.nr_cbufs; if (ctx->fb_state.zsbuf) { struct pipe_surface *psurf = ctx->fb_state.zsbuf; - state.attachments[state.num_attachments] = psurf ? zink_surface(psurf)->image_view : VK_NULL_HANDLE;; + state.attachments[state.num_attachments] = psurf ? zink_surface(psurf)->image_view : VK_NULL_HANDLE; attachments[state.num_attachments++] = psurf; } diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index 758ff90e53f..e2da0fa9d65 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -545,7 +545,7 @@ zink_descriptor_program_init(struct zink_context *ctx, unsigned total_descs = 0; for (unsigned i = 0; i < ZINK_DESCRIPTOR_TYPES; i++) { - total_descs += num_bindings[i];; + total_descs += num_bindings[i]; } if (!total_descs) return true; diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index 32a81e8068d..aae70164f11 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -411,7 +411,7 @@ update_shader_modules(struct zink_context *ctx, struct zink_shader *stages[ZINK_ prog->shaders[type] = stages[type]; } ctx->gfx_pipeline_state.module_hash = _mesa_hash_data(ctx->gfx_pipeline_state.modules, sizeof(ctx->gfx_pipeline_state.modules)); - unsigned clean = u_bit_consecutive(PIPE_SHADER_VERTEX, 5);; + unsigned clean = u_bit_consecutive(PIPE_SHADER_VERTEX, 5); ctx->dirty_shader_stages &= ~clean; }