util/u_format: Kill util_format_is_array().

It is buggy (it was giving wrong results for some of the formats with
padding), and util_format_description::is_array already does precisely
what's intended.

Reviewed-by: Roland Scheidegger <[email protected]>

2 files changed, 4 insertions, 2 deletions

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c
index 750d54524c6..0b54ba4c5f5 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c
@@ -481,7 +481,8 @@ lp_build_fetch_rgba_aos(struct gallivm_state *gallivm,
    }
 
    /* If all channels are of same type and we are not using half-floats */
-   if (util_format_is_array(format_desc)) {
+   if (format_desc->is_array) {
+      assert(!format_desc->is_mixed);
       return lp_build_fetch_rgba_aos_array(gallivm, format_desc, type, base_ptr, offset);
    }
 
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.h b/src/gallium/auxiliary/gallivm/lp_bld_type.h
index 6ce5501baf4..d0b490b51e8 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_type.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.h
@@ -176,7 +176,8 @@ struct lp_build_context
 static INLINE void
 lp_type_from_format_desc(struct lp_type* type, const struct util_format_description *format_desc)
 {
-   assert(util_format_is_array(format_desc));
+   assert(format_desc->is_array);
+   assert(!format_desc->is_mixed);
 
    memset(type, 0, sizeof(struct lp_type));
    type->floating = format_desc->channel[0].type == UTIL_FORMAT_TYPE_FLOAT;