Mesa (main): glsl: simplify conditions for setting various allowed flags

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: c17a3392c4c39a98d41ceb1278e606516a6b2a52
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c17a3392c4c39a98d41ceb1278e606516a6b2a52

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Thu Feb  3 20:40:30 2022 -0500

glsl: simplify conditions for setting various allowed flags

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14869>

---

 src/compiler/glsl/ast_to_hir.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index a3e97ba0275..5a6760b170e 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -8008,21 +8008,21 @@ ast_interface_block::hir(exec_list *instructions,
       if (this->layout.flags.q.out) {
          allowed_blk_qualifiers.flags.q.out = 1;
          if (state->stage == MESA_SHADER_GEOMETRY ||
-          state->stage == MESA_SHADER_TESS_CTRL ||
-          state->stage == MESA_SHADER_TESS_EVAL ||
-          state->stage == MESA_SHADER_VERTEX ) {
+             state->stage == MESA_SHADER_TESS_CTRL ||
+             state->stage == MESA_SHADER_TESS_EVAL ||
+             state->stage == MESA_SHADER_VERTEX ) {
             allowed_blk_qualifiers.flags.q.explicit_xfb_offset = 1;
             allowed_blk_qualifiers.flags.q.explicit_xfb_buffer = 1;
             allowed_blk_qualifiers.flags.q.xfb_buffer = 1;
             allowed_blk_qualifiers.flags.q.explicit_xfb_stride = 1;
             allowed_blk_qualifiers.flags.q.xfb_stride = 1;
-            if (state->stage == MESA_SHADER_GEOMETRY) {
-               allowed_blk_qualifiers.flags.q.stream = 1;
-               allowed_blk_qualifiers.flags.q.explicit_stream = 1;
-            }
-            if (state->stage == MESA_SHADER_TESS_CTRL) {
-               allowed_blk_qualifiers.flags.q.patch = 1;
-            }
+         }
+         if (state->stage == MESA_SHADER_GEOMETRY) {
+            allowed_blk_qualifiers.flags.q.stream = 1;
+            allowed_blk_qualifiers.flags.q.explicit_stream = 1;
+         }
+         if (state->stage == MESA_SHADER_TESS_CTRL) {
+            allowed_blk_qualifiers.flags.q.patch = 1;
          }
       } else {
          allowed_blk_qualifiers.flags.q.in = 1;