From: Roland Scheidegger <sroland@vmware.com>
Date: Tue, 9 Mar 2010 16:27:45 +0000 (+0100)
Subject: util: simplify util_format_get_nr_components helper
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e0f10a6fca34619f61c3533b68d89dcb1ff2627c;p=mesa.git

util: simplify util_format_get_nr_components helper

since the number of components is now stored in the pipe format description,
we obviously no longer need to figure this out ourselves.
---

diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h
index 20fdaca007f..c08fdcafcc8 100644
--- a/src/gallium/auxiliary/util/u_format.h
+++ b/src/gallium/auxiliary/util/u_format.h
@@ -423,14 +423,7 @@ static INLINE unsigned
 util_format_get_nr_components(enum pipe_format format)
 {
    const struct util_format_description *desc = util_format_description(format);
-   unsigned chan;
-   unsigned nr_comp = 0;
-   for (chan = 0; chan < 4; chan++) {
-      if (desc->channel[chan].size != 0) {
-         nr_comp++;
-      }
-   }
-   return nr_comp;
+   return desc->nr_channels;
 }
 
 /*