From ae6b7d1e3ecc15000da8403c43d89f448c19b294 Mon Sep 17 00:00:00 2001
From: Nanley Chery <nanley.g.chery@intel.com>
Date: Thu, 15 Oct 2020 10:11:57 -0700
Subject: [PATCH] intel/isl: Drop redundant unpack of unorm channels

Fixes: 09ced654204 ("intel/isl: Add format conversion code")
Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7168>
(cherry picked from commit 5e27e0432274a29e75f9267269a2b367eda33cbf)
---
 .pick_status.json          | 2 +-
 src/intel/isl/isl_format.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index c7c2f2175fa..a1607581e7b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -202,7 +202,7 @@
         "description": "intel/isl: Drop redundant unpack of unorm channels",
         "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 5f92c3e1f36..6b848c2c53c 100644
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -1272,7 +1272,6 @@ unpack_channel(union isl_color_value *value,
 
    switch (layout->type) {
    case ISL_UNORM:
-      unpacked.f32 = _mesa_unorm_to_float(packed, layout->bits);
       if (colorspace == ISL_COLORSPACE_SRGB) {
          if (layout->bits == 8) {
             unpacked.f32 = util_format_srgb_8unorm_to_linear_float(packed);