treewide: style fixes after replace usage of boolean to bool

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23577>

19 files changed, 88 insertions, 88 deletions

diff --git a/src/gallium/drivers/llvmpipe/lp_scene.h b/src/gallium/drivers/llvmpipe/lp_scene.h
index a762e15d4ea..ccbf0dffb3d 100644
--- a/src/gallium/drivers/llvmpipe/lp_scene.h
+++ b/src/gallium/drivers/llvmpipe/lp_scene.h
@@ -219,15 +219,15 @@ struct cmd_block *lp_scene_new_cmd_block(struct lp_scene *scene,
                                          struct cmd_bin *bin);
 
 bool lp_scene_add_resource_reference(struct lp_scene *scene,
-                                        struct pipe_resource *resource,
-                                        bool initializing_scene,
-                                        bool writeable);
+                                     struct pipe_resource *resource,
+                                     bool initializing_scene,
+                                     bool writeable);
 
 unsigned lp_scene_is_resource_referenced(const struct lp_scene *scene,
                                          const struct pipe_resource *resource);
 
 bool lp_scene_add_frag_shader_reference(struct lp_scene *scene,
-                                           struct lp_fragment_shader_variant *variant);
+                                        struct lp_fragment_shader_variant *variant);
 
 
 
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 462d341652c..da6f4a5e996 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -675,10 +675,10 @@ generate_fs_loop(struct gallivm_state *gallivm,
     * code since tests tend to take another codepath than real shaders.
     */
    bool simple_shader = (shader->info.base.file_count[TGSI_FILE_SAMPLER] == 0 &&
-                            shader->info.base.num_inputs < 3 &&
-                            shader->info.base.num_instructions < 8) && 0;
+                         shader->info.base.num_inputs < 3 &&
+                         shader->info.base.num_instructions < 8) && 0;
    const bool dual_source_blend = key->blend.rt[0].blend_enable &&
-                                     util_blend_state_is_dual(&key->blend, 0);
+                                  util_blend_state_is_dual(&key->blend, 0);
    const bool post_depth_coverage = shader->info.base.properties[TGSI_PROPERTY_FS_POST_DEPTH_COVERAGE];
 
    struct lp_bld_tgsi_system_values system_values;
@@ -3135,7 +3135,7 @@ generate_fragment(struct llvmpipe_context *lp,
    LLVMValueRef facing;
    bool cbuf0_write_all;
    const bool dual_source_blend = key->blend.rt[0].blend_enable &&
-                                     util_blend_state_is_dual(&key->blend, 0);
+                                  util_blend_state_is_dual(&key->blend, 0);
 
    assert(lp_native_vector_width / 32 >= 4);
 
@@ -3486,9 +3486,9 @@ generate_fragment(struct llvmpipe_context *lp,
          LLVMValueRef index = lp_build_const_int32(gallivm, cbuf);
 
          bool do_branch = ((key->depth.enabled
-                               || key->stencil[0].enabled
-                               || key->alpha.enabled)
-                              && !shader->info.base.uses_kill);
+                            || key->stencil[0].enabled
+                            || key->alpha.enabled)
+                           && !shader->info.base.uses_kill);
 
          color_ptr = LLVMBuildLoad2(builder, int8p_type,
                                     LLVMBuildGEP2(builder, int8p_type, color_ptr_ptr,
@@ -4543,7 +4543,7 @@ make_variant_key(struct llvmpipe_context *lp,
              format_desc->swizzle[3] == format_desc->swizzle[0]) {
             // Doesn't cover mixed snorm/unorm but can't render to them anyway
             bool clamped_zero = !util_format_is_float(format) &&
-                                   !util_format_is_snorm(format);
+                                !util_format_is_snorm(format);
             blend_rt->rgb_src_factor =
                force_dst_alpha_one(blend_rt->rgb_src_factor, clamped_zero);
             blend_rt->rgb_dst_factor =
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 069892f74e9..073393d962f 100644
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -133,7 +133,7 @@ static uint32_t r300_depth_clear_cb_value(enum pipe_format format,
 }
 
 static bool r300_cbzb_clear_allowed(struct r300_context *r300,
-                                       unsigned clear_buffers)
+                                    unsigned clear_buffers)
 {
     struct pipe_framebuffer_state *fb =
         (struct pipe_framebuffer_state*)r300->fb_state.state;
@@ -146,7 +146,7 @@ static bool r300_cbzb_clear_allowed(struct r300_context *r300,
 }
 
 static bool r300_fast_zclear_allowed(struct r300_context *r300,
-                                        unsigned clear_buffers)
+                                     unsigned clear_buffers)
 {
     struct pipe_framebuffer_state *fb =
         (struct pipe_framebuffer_state*)r300->fb_state.state;
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index cb7e5b676fd..52bc70386f9 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -1301,8 +1301,8 @@ void r300_emit_texture_cache_inval(struct r300_context* r300, unsigned size, voi
 }
 
 bool r300_emit_buffer_validate(struct r300_context *r300,
-                                  bool do_validate_vertex_buffers,
-                                  struct pipe_resource *index_buffer)
+                               bool do_validate_vertex_buffers,
+                               struct pipe_resource *index_buffer)
 {
     struct pipe_framebuffer_state *fb =
         (struct pipe_framebuffer_state*)r300->fb_state.state;
diff --git a/src/gallium/drivers/r300/r300_emit.h b/src/gallium/drivers/r300/r300_emit.h
index e378c64d51f..c67a7f9e8e7 100644
--- a/src/gallium/drivers/r300/r300_emit.h
+++ b/src/gallium/drivers/r300/r300_emit.h
@@ -126,7 +126,7 @@ unsigned r300_get_num_cs_end_dwords(struct r300_context *r300);
 void r300_emit_dirty_state(struct r300_context* r300);
 
 bool r300_emit_buffer_validate(struct r300_context *r300,
-                                  bool do_validate_vertex_buffers,
-                                  struct pipe_resource *index_buffer);
+                               bool do_validate_vertex_buffers,
+                               struct pipe_resource *index_buffer);
 
 #endif /* R300_EMIT_H */
diff --git a/src/gallium/drivers/r300/r300_fs.c b/src/gallium/drivers/r300/r300_fs.c
index 98fe7607579..49cd34f746b 100644
--- a/src/gallium/drivers/r300/r300_fs.c
+++ b/src/gallium/drivers/r300/r300_fs.c
@@ -576,8 +576,8 @@ static void r300_translate_fragment_shader(
 }
 
 bool r300_pick_fragment_shader(struct r300_context *r300,
-                                  struct r300_fragment_shader* fs,
-                                  struct r300_fragment_program_external_state *state)
+                               struct r300_fragment_shader* fs,
+                               struct r300_fragment_program_external_state *state)
 {
     struct r300_fragment_shader_code* ptr;
 
diff --git a/src/gallium/drivers/r300/r300_fs.h b/src/gallium/drivers/r300/r300_fs.h
index 3d1b14add97..8e011bb2ca7 100644
--- a/src/gallium/drivers/r300/r300_fs.h
+++ b/src/gallium/drivers/r300/r300_fs.h
@@ -76,8 +76,8 @@ void r300_shader_read_fs_inputs(struct tgsi_shader_info* info,
 
 /* Return TRUE if the shader was switched and should be re-emitted. */
 bool r300_pick_fragment_shader(struct r300_context *r300,
-                                  struct r300_fragment_shader* fs,
-                                  struct r300_fragment_program_external_state *state);
+                               struct r300_fragment_shader* fs,
+                               struct r300_fragment_program_external_state *state);
 void r300_fragment_program_get_external_state(struct r300_context *r300,
                                               struct r300_fragment_program_external_state *state);
 
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 7bac33a88a4..09e56dc245f 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -194,8 +194,8 @@ enum r300_prepare_flags {
  * \return TRUE if the CS was flushed
  */
 static bool r300_reserve_cs_dwords(struct r300_context *r300,
-                                      enum r300_prepare_flags flags,
-                                      unsigned cs_dwords)
+                                   enum r300_prepare_flags flags,
+                                   unsigned cs_dwords)
 {
     bool flushed        = FALSE;
     bool emit_states    = flags & PREP_EMIT_STATES;
@@ -237,10 +237,10 @@ static bool r300_reserve_cs_dwords(struct r300_context *r300,
  * \return TRUE if rendering should be skipped
  */
 static bool r300_emit_states(struct r300_context *r300,
-                                enum r300_prepare_flags flags,
-                                struct pipe_resource *index_buffer,
-                                int buffer_offset,
-                                int index_bias, int instance_id)
+                             enum r300_prepare_flags flags,
+                             struct pipe_resource *index_buffer,
+                             int buffer_offset,
+                             int index_bias, int instance_id)
 {
     bool emit_states    = flags & PREP_EMIT_STATES;
     bool emit_vertex_arrays       = flags & PREP_EMIT_VARRAYS;
@@ -300,12 +300,12 @@ static bool r300_emit_states(struct r300_context *r300,
  * \return TRUE if rendering should be skipped
  */
 static bool r300_prepare_for_rendering(struct r300_context *r300,
-                                          enum r300_prepare_flags flags,
-                                          struct pipe_resource *index_buffer,
-                                          unsigned cs_dwords,
-                                          int buffer_offset,
-                                          int index_bias,
-                                          int instance_id)
+                                       enum r300_prepare_flags flags,
+                                       struct pipe_resource *index_buffer,
+                                       unsigned cs_dwords,
+                                       int buffer_offset,
+                                       int index_bias,
+                                       int instance_id)
 {
     /* Make sure there is enough space in the command stream and emit states. */
     if (r300_reserve_cs_dwords(r300, flags, cs_dwords))
@@ -316,7 +316,7 @@ static bool r300_prepare_for_rendering(struct r300_context *r300,
 }
 
 static bool immd_is_good_idea(struct r300_context *r300,
-                                 unsigned count)
+                              unsigned count)
 {
     if (DBG_ON(r300, DBG_NO_IMMD)) {
         return FALSE;
@@ -940,8 +940,8 @@ r300_render_get_vertex_info(struct vbuf_render* render)
 }
 
 static bool r300_render_allocate_vertices(struct vbuf_render* render,
-                                             ushort vertex_size,
-                                             ushort count)
+                                          ushort vertex_size,
+                                          ushort count)
 {
     struct r300_render* r300render = r300_render(render);
     struct r300_context* r300 = r300render->r300;
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 5930dbffdd3..80438315cd6 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -647,23 +647,23 @@ static bool r300_is_format_supported(struct pipe_screen* screen,
     bool is_r500 = r300_screen(screen)->caps.is_r500;
     bool is_r400 = r300_screen(screen)->caps.is_r400;
     bool is_color2101010 = format == PIPE_FORMAT_R10G10B10A2_UNORM ||
-                              format == PIPE_FORMAT_R10G10B10X2_SNORM ||
-                              format == PIPE_FORMAT_B10G10R10A2_UNORM ||
-                              format == PIPE_FORMAT_B10G10R10X2_UNORM ||
-                              format == PIPE_FORMAT_R10SG10SB10SA2U_NORM;
+                           format == PIPE_FORMAT_R10G10B10X2_SNORM ||
+                           format == PIPE_FORMAT_B10G10R10A2_UNORM ||
+                           format == PIPE_FORMAT_B10G10R10X2_UNORM ||
+                           format == PIPE_FORMAT_R10SG10SB10SA2U_NORM;
     bool is_ati1n = format == PIPE_FORMAT_RGTC1_UNORM ||
-                       format == PIPE_FORMAT_RGTC1_SNORM ||
-                       format == PIPE_FORMAT_LATC1_UNORM ||
-                       format == PIPE_FORMAT_LATC1_SNORM;
+                    format == PIPE_FORMAT_RGTC1_SNORM ||
+                    format == PIPE_FORMAT_LATC1_UNORM ||
+                    format == PIPE_FORMAT_LATC1_SNORM;
     bool is_ati2n = format == PIPE_FORMAT_RGTC2_UNORM ||
-                       format == PIPE_FORMAT_RGTC2_SNORM ||
-                       format == PIPE_FORMAT_LATC2_UNORM ||
-                       format == PIPE_FORMAT_LATC2_SNORM;
+                    format == PIPE_FORMAT_RGTC2_SNORM ||
+                    format == PIPE_FORMAT_LATC2_UNORM ||
+                    format == PIPE_FORMAT_LATC2_SNORM;
     bool is_half_float = format == PIPE_FORMAT_R16_FLOAT ||
-                            format == PIPE_FORMAT_R16G16_FLOAT ||
-                            format == PIPE_FORMAT_R16G16B16_FLOAT ||
-                            format == PIPE_FORMAT_R16G16B16A16_FLOAT ||
-                            format == PIPE_FORMAT_R16G16B16X16_FLOAT;
+                         format == PIPE_FORMAT_R16G16_FLOAT ||
+                         format == PIPE_FORMAT_R16G16B16_FLOAT ||
+                         format == PIPE_FORMAT_R16G16B16A16_FLOAT ||
+                         format == PIPE_FORMAT_R16G16B16X16_FLOAT;
     const struct util_format_description *desc;
 
     if (MAX2(1, sample_count) != MAX2(1, storage_sample_count))
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index 195322c4afc..6a61f939e47 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -59,7 +59,7 @@
     }
 
 static bool blend_discard_if_src_alpha_0(unsigned srcRGB, unsigned srcA,
-                                            unsigned dstRGB, unsigned dstA)
+                                         unsigned dstRGB, unsigned dstA)
 {
     /* If the blend equation is ADD or REVERSE_SUBTRACT,
      * SRC_ALPHA == 0, and the following state is set, the colorbuffer
@@ -80,7 +80,7 @@ static bool blend_discard_if_src_alpha_0(unsigned srcRGB, unsigned srcA,
 }
 
 static bool blend_discard_if_src_alpha_1(unsigned srcRGB, unsigned srcA,
-                                            unsigned dstRGB, unsigned dstA)
+                                         unsigned dstRGB, unsigned dstA)
 {
     /* If the blend equation is ADD or REVERSE_SUBTRACT,
      * SRC_ALPHA == 1, and the following state is set, the colorbuffer
@@ -99,7 +99,7 @@ static bool blend_discard_if_src_alpha_1(unsigned srcRGB, unsigned srcA,
 }
 
 static bool blend_discard_if_src_color_0(unsigned srcRGB, unsigned srcA,
-                                            unsigned dstRGB, unsigned dstA)
+                                         unsigned dstRGB, unsigned dstA)
 {
     /* If the blend equation is ADD or REVERSE_SUBTRACT,
      * SRC_COLOR == (0,0,0), and the following state is set, the colorbuffer
@@ -114,7 +114,7 @@ static bool blend_discard_if_src_color_0(unsigned srcRGB, unsigned srcA,
 }
 
 static bool blend_discard_if_src_color_1(unsigned srcRGB, unsigned srcA,
-                                            unsigned dstRGB, unsigned dstA)
+                                         unsigned dstRGB, unsigned dstA)
 {
     /* If the blend equation is ADD or REVERSE_SUBTRACT,
      * SRC_COLOR == (1,1,1), and the following state is set, the colorbuffer
@@ -129,7 +129,7 @@ static bool blend_discard_if_src_color_1(unsigned srcRGB, unsigned srcA,
 }
 
 static bool blend_discard_if_src_alpha_color_0(unsigned srcRGB, unsigned srcA,
-                                                  unsigned dstRGB, unsigned dstA)
+                                               unsigned dstRGB, unsigned dstA)
 {
     /* If the blend equation is ADD or REVERSE_SUBTRACT,
      * SRC_ALPHA_COLOR == (0,0,0,0), and the following state is set,
@@ -152,7 +152,7 @@ static bool blend_discard_if_src_alpha_color_0(unsigned srcRGB, unsigned srcA,
 }
 
 static bool blend_discard_if_src_alpha_color_1(unsigned srcRGB, unsigned srcA,
-                                                  unsigned dstRGB, unsigned dstA)
+                                               unsigned dstRGB, unsigned dstA)
 {
     /* If the blend equation is ADD or REVERSE_SUBTRACT,
      * SRC_ALPHA_COLOR == (1,1,1,1), and the following state is set,
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 6272f7b2904..d83ab338789 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -323,7 +323,7 @@ static void r300_update_rs_block(struct r300_context *r300)
     void (*rX00_rs_tex)(struct r300_rs_block*, int, int, enum r300_rs_swizzle);
     void (*rX00_rs_tex_write)(struct r300_rs_block*, int, int);
     bool any_bcolor_used = vs_outputs->bcolor[0] != ATTR_UNUSED ||
-                              vs_outputs->bcolor[1] != ATTR_UNUSED;
+                           vs_outputs->bcolor[1] != ATTR_UNUSED;
     int *stream_loc_notcl = r300->stream_loc_notcl;
     uint32_t stuffing_enable = 0;
 
diff --git a/src/gallium/drivers/r300/r300_texture_desc.c b/src/gallium/drivers/r300/r300_texture_desc.c
index 6c07625ec94..b16730a3268 100644
--- a/src/gallium/drivers/r300/r300_texture_desc.c
+++ b/src/gallium/drivers/r300/r300_texture_desc.c
@@ -81,9 +81,9 @@ unsigned r300_get_pixel_alignment(enum pipe_format format,
 
 /* Return true if macrotiling should be enabled on the miplevel. */
 static bool r300_texture_macro_switch(struct r300_resource *tex,
-                                         unsigned level,
-                                         bool rv350_mode,
-                                         enum r300_dim dim)
+                                      unsigned level,
+                                      bool rv350_mode,
+                                      enum r300_dim dim)
 {
     unsigned tile, texdim;
 
@@ -117,8 +117,8 @@ static unsigned r300_texture_get_stride(struct r300_screen *screen,
 {
     unsigned tile_width, width, stride;
     bool is_rs690 = (screen->caps.family == CHIP_RS600 ||
-                        screen->caps.family == CHIP_RS690 ||
-                        screen->caps.family == CHIP_RS740);
+                     screen->caps.family == CHIP_RS690 ||
+                     screen->caps.family == CHIP_RS740);
 
     if (tex->tex.stride_in_bytes_override)
         return tex->tex.stride_in_bytes_override;
diff --git a/src/gallium/drivers/r300/r300_vs.c b/src/gallium/drivers/r300/r300_vs.c
index e571acd02b2..a5bf371d958 100644
--- a/src/gallium/drivers/r300/r300_vs.c
+++ b/src/gallium/drivers/r300/r300_vs.c
@@ -114,7 +114,7 @@ static void set_vertex_inputs_outputs(struct r300_vertex_program_compiler * c)
     struct tgsi_shader_info* info = &vs->info;
     int i, reg = 0;
     bool any_bcolor_used = outputs->bcolor[0] != ATTR_UNUSED ||
-                              outputs->bcolor[1] != ATTR_UNUSED;
+                           outputs->bcolor[1] != ATTR_UNUSED;
 
     /* Fill in the input mapping */
     for (i = 0; i < info->num_inputs; i++)
diff --git a/src/gallium/drivers/svga/svga_context.h b/src/gallium/drivers/svga/svga_context.h
index 929a1d3adea..e73143ac40a 100644
--- a/src/gallium/drivers/svga/svga_context.h
+++ b/src/gallium/drivers/svga/svga_context.h
@@ -1110,7 +1110,7 @@ svga_retry_exit(struct svga_context *svga)
  */
 #define SVGA_RETRY(_svga, _func)                \
    do {                                         \
-      UNUSED bool retried;                   \
+      UNUSED bool retried;                      \
                                                 \
       SVGA_RETRY_CHECK(_svga, _func, retried);  \
    } while(0)
diff --git a/src/gallium/drivers/svga/svga_resource_texture.c b/src/gallium/drivers/svga/svga_resource_texture.c
index d024ff3c48c..3824fc4ee12 100644
--- a/src/gallium/drivers/svga/svga_resource_texture.c
+++ b/src/gallium/drivers/svga/svga_resource_texture.c
@@ -481,7 +481,7 @@ svga_texture_transfer_map(struct pipe_context *pipe,
    struct svga_transfer *st;
    struct svga_winsys_surface *surf = tex->handle;
    bool use_direct_map = svga_have_gb_objects(svga) &&
-       (!svga_have_gb_dma(svga) || (usage & PIPE_MAP_WRITE));
+                         (!svga_have_gb_dma(svga) || (usage & PIPE_MAP_WRITE));
    void *map = NULL;
    int64_t begin = svga_get_time(svga);
 
@@ -564,7 +564,7 @@ svga_texture_transfer_map(struct pipe_context *pipe,
    }
    else {
       bool can_use_upload = tex->can_use_upload &&
-                               !(st->base.usage & PIPE_MAP_READ);
+                            !(st->base.usage & PIPE_MAP_READ);
       bool was_rendered_to =
          svga_was_texture_rendered_to(svga_texture(texture));
       bool is_dirty = svga_is_texture_dirty(svga_texture(texture));
diff --git a/src/gallium/drivers/svga/svga_tgsi_insn.c b/src/gallium/drivers/svga/svga_tgsi_insn.c
index 98540075ff1..7ac78f5155c 100644
--- a/src/gallium/drivers/svga/svga_tgsi_insn.c
+++ b/src/gallium/drivers/svga/svga_tgsi_insn.c
@@ -1354,12 +1354,12 @@ emit_cond_discard(struct svga_shader_emitter *emit,
    const struct tgsi_full_src_register *reg = &insn->Src[0];
    struct src_register src0, srcIn;
    const bool special = (reg->Register.Absolute ||
-                            reg->Register.Negate ||
-                            reg->Register.Indirect ||
-                            reg->Register.SwizzleX != 0 ||
-                            reg->Register.SwizzleY != 1 ||
-                            reg->Register.SwizzleZ != 2 ||
-                            reg->Register.File != TGSI_FILE_TEMPORARY);
+                         reg->Register.Negate ||
+                         reg->Register.Indirect ||
+                         reg->Register.SwizzleX != 0 ||
+                         reg->Register.SwizzleY != 1 ||
+                         reg->Register.SwizzleZ != 2 ||
+                         reg->Register.File != TGSI_FILE_TEMPORARY);
    SVGA3dShaderDestToken temp;
 
    src0 = srcIn = translate_src_register( emit, reg );
@@ -1812,13 +1812,13 @@ emit_tex(struct svga_shader_emitter *emit,
 
    /* check for shadow samplers */
    bool compare = (emit->key.tex[unit].compare_mode ==
-                      PIPE_TEX_COMPARE_R_TO_TEXTURE);
+                   PIPE_TEX_COMPARE_R_TO_TEXTURE);
 
    /* texture swizzle */
    bool swizzle = (emit->key.tex[unit].swizzle_r != PIPE_SWIZZLE_X ||
-                      emit->key.tex[unit].swizzle_g != PIPE_SWIZZLE_Y ||
-                      emit->key.tex[unit].swizzle_b != PIPE_SWIZZLE_Z ||
-                      emit->key.tex[unit].swizzle_a != PIPE_SWIZZLE_W);
+                   emit->key.tex[unit].swizzle_g != PIPE_SWIZZLE_Y ||
+                   emit->key.tex[unit].swizzle_b != PIPE_SWIZZLE_Z ||
+                   emit->key.tex[unit].swizzle_a != PIPE_SWIZZLE_W);
 
    bool saturate = insn->Instruction.Saturate;
 
diff --git a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
index 643aad9d423..c74c933aba3 100644
--- a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
+++ b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
@@ -10361,7 +10361,7 @@ emit_load_instruction(struct svga_shader_emitter_v10 *emit,
  */
 static bool
 emit_load(struct svga_shader_emitter_v10 *emit,
-           const struct tgsi_full_instruction *inst)
+          const struct tgsi_full_instruction *inst)
 {
    enum tgsi_file_type resourceType = inst->Src[0].Register.File;
    unsigned resourceIndex = inst->Src[0].Register.Index;
@@ -10850,7 +10850,7 @@ emit_memory_barrier(struct svga_shader_emitter_v10 *emit,
  */
 static bool
 emit_resq(struct svga_shader_emitter_v10 *emit,
-         const struct tgsi_full_instruction *inst)
+          const struct tgsi_full_instruction *inst)
 {
    struct tgsi_full_src_register zero =
       make_immediate_reg_int(emit, 0);
diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
index 5d4ba3dbc3e..0bd70d2be85 100644
--- a/src/gallium/drivers/virgl/virgl_screen.c
+++ b/src/gallium/drivers/virgl/virgl_screen.c
@@ -753,10 +753,10 @@ virgl_is_format_supported( struct pipe_screen *screen,
    const struct util_format_description *format_desc;
    int i;
 
-   union virgl_caps *caps = &vscreen->caps.caps; 
+   union virgl_caps *caps = &vscreen->caps.caps;
    bool may_emulate_bgra = (caps->v2.capability_bits &
-                               VIRGL_CAP_APP_TWEAK_SUPPORT) &&
-                               vscreen->tweak_gles_emulate_bgra;
+                            VIRGL_CAP_APP_TWEAK_SUPPORT) &&
+                            vscreen->tweak_gles_emulate_bgra;
 
    if (MAX2(1, sample_count) != MAX2(1, storage_sample_count))
       return false;
diff --git a/src/gallium/drivers/virgl/virgl_winsys.h b/src/gallium/drivers/virgl/virgl_winsys.h
index b68fec72745..e780f5eef9b 100644
--- a/src/gallium/drivers/virgl/virgl_winsys.h
+++ b/src/gallium/drivers/virgl/virgl_winsys.h
@@ -82,7 +82,7 @@ struct virgl_winsys {
    void *(*resource_map)(struct virgl_winsys *vws, struct virgl_hw_res *res);
    void (*resource_wait)(struct virgl_winsys *vws, struct virgl_hw_res *res);
    bool (*resource_is_busy)(struct virgl_winsys *vws,
-                               struct virgl_hw_res *res);
+                            struct virgl_hw_res *res);
 
    struct virgl_hw_res *(*resource_create_from_handle)(struct virgl_winsys *vws,
                                                        struct winsys_handle *whandle,
@@ -101,9 +101,9 @@ struct virgl_winsys {
                              const uint32_t *plane_offsets);
 
    bool (*resource_get_handle)(struct virgl_winsys *vws,
-                                  struct virgl_hw_res *res,
-                                  uint32_t stride,
-                                  struct winsys_handle *whandle);
+                               struct virgl_hw_res *res,
+                               uint32_t stride,
+                               struct winsys_handle *whandle);
 
    uint32_t (*resource_get_storage_size)(struct virgl_winsys* vws,
                                          struct virgl_hw_res* res);
@@ -116,8 +116,8 @@ struct virgl_winsys {
                      struct pipe_fence_handle **fence);
 
    bool (*res_is_referenced)(struct virgl_winsys *vws,
-                                struct virgl_cmd_buf *buf,
-                                struct virgl_hw_res *res);
+                             struct virgl_cmd_buf *buf,
+                             struct virgl_hw_res *res);
 
    int (*get_caps)(struct virgl_winsys *vws, struct virgl_drm_caps *caps);