Mesa (master): nir: Refactor tex_instr_dest_size to use a switch statement

Jason Ekstrand jekstrand at kemper.freedesktop.org
Thu Apr 23 01:11:07 UTC 2015


Module: Mesa
Branch: master
Commit: 94669cb53483bd58f33e439411af3cb5c006da79
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94669cb53483bd58f33e439411af3cb5c006da79

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Apr  9 21:03:02 2015 -0700

nir: Refactor tex_instr_dest_size to use a switch statement

Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>

---

 src/glsl/nir/nir.h |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
index 74772c7..c07a955 100644
--- a/src/glsl/nir/nir.h
+++ b/src/glsl/nir/nir.h
@@ -960,7 +960,8 @@ typedef struct {
 static inline unsigned
 nir_tex_instr_dest_size(nir_tex_instr *instr)
 {
-   if (instr->op == nir_texop_txs) {
+   switch (instr->op) {
+   case nir_texop_txs: {
       unsigned ret;
       switch (instr->sampler_dim) {
          case GLSL_SAMPLER_DIM_1D:
@@ -985,13 +986,15 @@ nir_tex_instr_dest_size(nir_tex_instr *instr)
       return ret;
    }
 
-   if (instr->op == nir_texop_query_levels)
+   case nir_texop_query_levels:
       return 2;
 
-   if (instr->is_shadow && instr->is_new_style_shadow)
-      return 1;
+   default:
+      if (instr->is_shadow && instr->is_new_style_shadow)
+         return 1;
 
-   return 4;
+      return 4;
+   }
 }
 
 static inline unsigned




More information about the mesa-commit mailing list