Merge branch '7.8'

[mesa.git] / src / gallium / auxiliary / util / u_format.h

diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h
index 20fdaca007f45af2eee7e6666244c338ce3bff89..c08fdcafcc8deca38f5013e5570924687f15c070 100644 (file)
--- 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;
 }
 
 /*