From: Eric Anholt <eric@anholt.net>
Date: Thu, 13 Aug 2020 02:45:55 +0000 (-0700)
Subject: util: Mark the format description getter functions as const.
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=9cc84369b70781e5e0984c7950e4d084abce8050

util: Mark the format description getter functions as const.

This lets the compiler CSE calls to them on the same format.  This is
particularly relevant for the description table lookup calls, which other
inlines might do internally.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6305>
---

diff --git a/src/util/format/u_format.h b/src/util/format/u_format.h
index 41d795e7b3f..bfbf74d1fb8 100644
--- a/src/util/format/u_format.h
+++ b/src/util/format/u_format.h
@@ -391,10 +391,10 @@ const struct util_format_description *
 util_format_description(enum pipe_format format) ATTRIBUTE_CONST;
 
 const struct util_format_pack_description *
-util_format_pack_description(enum pipe_format format);
+util_format_pack_description(enum pipe_format format) ATTRIBUTE_CONST;
 
 const struct util_format_unpack_description *
-util_format_unpack_description(enum pipe_format format);
+util_format_unpack_description(enum pipe_format format) ATTRIBUTE_CONST;
 
 
 /*
@@ -676,46 +676,46 @@ util_format_colormask_full(const struct util_format_description *desc, unsigned
 
 
 boolean
-util_format_is_float(enum pipe_format format);
+util_format_is_float(enum pipe_format format) ATTRIBUTE_CONST;
 
 
 boolean
-util_format_has_alpha(enum pipe_format format);
+util_format_has_alpha(enum pipe_format format) ATTRIBUTE_CONST;
 
 
 boolean
-util_format_is_luminance(enum pipe_format format);
+util_format_is_luminance(enum pipe_format format) ATTRIBUTE_CONST;
 
 boolean
-util_format_is_alpha(enum pipe_format format);
+util_format_is_alpha(enum pipe_format format) ATTRIBUTE_CONST;
 
 boolean
-util_format_is_luminance_alpha(enum pipe_format format);
+util_format_is_luminance_alpha(enum pipe_format format) ATTRIBUTE_CONST;
 
 
 boolean
-util_format_is_intensity(enum pipe_format format);
+util_format_is_intensity(enum pipe_format format) ATTRIBUTE_CONST;
 
 boolean
-util_format_is_subsampled_422(enum pipe_format format);
+util_format_is_subsampled_422(enum pipe_format format) ATTRIBUTE_CONST;
 
 boolean
-util_format_is_pure_integer(enum pipe_format format);
+util_format_is_pure_integer(enum pipe_format format) ATTRIBUTE_CONST;
 
 boolean
-util_format_is_pure_sint(enum pipe_format format);
+util_format_is_pure_sint(enum pipe_format format) ATTRIBUTE_CONST;
 
 boolean
-util_format_is_pure_uint(enum pipe_format format);
+util_format_is_pure_uint(enum pipe_format format) ATTRIBUTE_CONST;
 
 boolean
-util_format_is_snorm(enum pipe_format format);
+util_format_is_snorm(enum pipe_format format) ATTRIBUTE_CONST;
 
 boolean
-util_format_is_unorm(enum pipe_format format);
+util_format_is_unorm(enum pipe_format format) ATTRIBUTE_CONST;
 
 boolean
-util_format_is_snorm8(enum pipe_format format);
+util_format_is_snorm8(enum pipe_format format) ATTRIBUTE_CONST;
 
 /**
  * Check if the src format can be blitted to the destination format with
@@ -724,7 +724,7 @@ util_format_is_snorm8(enum pipe_format format);
  */
 boolean
 util_is_format_compatible(const struct util_format_description *src_desc,
-                          const struct util_format_description *dst_desc);
+                          const struct util_format_description *dst_desc) ATTRIBUTE_CONST;
 
 /**
  * Whether this format is a rgab8 variant.
@@ -1541,7 +1541,7 @@ util_format_write_4ub(enum pipe_format format,
  */
 
 boolean
-util_format_fits_8unorm(const struct util_format_description *format_desc);
+util_format_fits_8unorm(const struct util_format_description *format_desc) ATTRIBUTE_CONST;
 
 boolean
 util_format_translate(enum pipe_format dst_format,
@@ -1594,7 +1594,7 @@ void util_format_unswizzle_4f(float *dst, const float *src,
                               const unsigned char swz[4]);
 
 enum pipe_format
-util_format_snorm8_to_sint8(enum pipe_format format);
+util_format_snorm8_to_sint8(enum pipe_format format) ATTRIBUTE_CONST;
 
 
 extern void