From fecbc1e541fccb59bc7004508c2b2a8353524805 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Date: Tue, 24 Nov 2020 11:30:01 +0100
Subject: [PATCH] gallivm: update fallthrough comments

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7747>
---
 src/gallium/auxiliary/gallivm/lp_bld_printf.c     | 3 ++-
 src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c | 3 ++-
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c  | 2 ++
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c   | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_printf.c b/src/gallium/auxiliary/gallivm/lp_bld_printf.c
index 1772fd0e8cd..aa52e0387ba 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_printf.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_printf.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <inttypes.h>
 
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
@@ -173,7 +174,7 @@ lp_get_printf_arg_count(const char *fmt)
           p += 3;
                continue;
        }
-       /* fallthrough */
+       FALLTHROUGH;
     default:
        count ++;
       }
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
index 2b91edd37c7..6740907ebcb 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
@@ -36,6 +36,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 #include "pipe/p_shader_tokens.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_dump.h"
 #include "util/u_memory.h"
@@ -2172,7 +2173,7 @@ lp_build_sample_common(struct lp_build_sample_context *bld,
             break;
          case PIPE_TEX_MIPFILTER_NEAREST:
              *lod_fpart = lp_build_round(&bld->lodf_bld, *lod_fpart);
-             /* fallthrough */
+             FALLTHROUGH;
          case PIPE_TEX_MIPFILTER_LINEAR:
             *lod_fpart = lp_build_clamp(&bld->lodf_bld, *lod_fpart,
                                         bld->lodf_bld.zero, last_level);
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c
index 9738770abe2..8650f97054c 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c
@@ -26,6 +26,7 @@
  **************************************************************************/
 
 
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "util/u_math.h"
 #include "tgsi/tgsi_parse.h"
@@ -458,6 +459,7 @@ analyse_instruction(struct analysis_context *ctx,
       /* XXX: Are there more cases? */
       memset(&ctx->temp, 0, sizeof ctx->temp);
       memset(&info->output, 0, sizeof info->output);
+      FALLTHROUGH;
    default:
       break;
    }
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index cbaebca4881..a9c04970cad 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -2091,14 +2091,14 @@ emit_tex( struct lp_build_tgsi_soa_context *bld,
    switch (inst->Texture.Texture) {
    case TGSI_TEXTURE_1D_ARRAY:
       layer_coord = 1;
-      /* fallthrough */
+      FALLTHROUGH;
    case TGSI_TEXTURE_1D:
       num_offsets = 1;
       num_derivs = 1;
       break;
    case TGSI_TEXTURE_2D_ARRAY:
       layer_coord = 2;
-      /* fallthrough */
+      FALLTHROUGH;
    case TGSI_TEXTURE_2D:
    case TGSI_TEXTURE_RECT:
       num_offsets = 2;
@@ -2106,7 +2106,7 @@ emit_tex( struct lp_build_tgsi_soa_context *bld,
       break;
    case TGSI_TEXTURE_SHADOW1D_ARRAY:
       layer_coord = 1;
-      /* fallthrough */
+      FALLTHROUGH;
    case TGSI_TEXTURE_SHADOW1D:
       shadow_coord = 2;
       num_offsets = 1;