From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 7 Oct 2017 04:11:59 +0000 (-0700)
Subject: mesa: Make _mesa_get_format_bytes handle array formats.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51e7879544728e22bed74ea46437638856c8eb55;p=mesa.git

mesa: Make _mesa_get_format_bytes handle array formats.

This is easier than making callers handle a bunch of special cases.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 34450003572..c1d8641116e 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -109,6 +109,11 @@ _mesa_get_format_name(mesa_format format)
 GLint
 _mesa_get_format_bytes(mesa_format format)
 {
+   if (_mesa_format_is_mesa_array_format(format)) {
+      return _mesa_array_format_get_type_size(format) *
+             _mesa_array_format_get_num_channels(format);
+   }
+
    const struct gl_format_info *info = _mesa_get_format_info(format);
    assert(info->BytesPerBlock);
    assert(info->BytesPerBlock <= MAX_PIXEL_BYTES ||