Mesa (staging/21.1): intel/isl: Fix isl_color_value_unpack to match the prototype

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: dd20621ac3647a7ffcc258884e6b37eb33df62c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd20621ac3647a7ffcc258884e6b37eb33df62c7

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Thu Apr 29 22:47:35 2021 -0500

intel/isl: Fix isl_color_value_unpack to match the prototype

The prototype uses a pointer and the actual function definition had an
array.  For some reason, GCC never complained about this until GCC 11.
This fixes a compile warning when building with GCC 11.

Fixes: 09ced6542049 "intel/isl: Add format conversion code"
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10537>
(cherry picked from commit b80720acb13e1014aea89e6bd25f22d43df85356)

---

 .pick_status.json          | 2 +-
 src/intel/isl/isl_format.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9b6f075d8cb..71a322989c3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "intel/isl: Fix isl_color_value_unpack to match the prototype",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "09ced6542049986f7fe52af8087aec9fc23d9f16"
     },
diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
index 5443f6ea0c7..9864e69dc26 100644
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -1318,7 +1318,7 @@ unpack_channel(union isl_color_value *value,
 void
 isl_color_value_unpack(union isl_color_value *value,
                        enum isl_format format,
-                       const uint32_t data_in[4])
+                       const uint32_t *data_in)
 {
    const struct isl_format_layout *fmtl = isl_format_get_layout(format);
    assert(fmtl->colorspace == ISL_COLORSPACE_LINEAR ||