Mesa (staging/20.1): amd/addrlib: remove unused members of ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Jun  9 03:06:22 2020 -0400

amd/addrlib: remove unused members of ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
(cherry picked from commit e6996d6fbdf3f9351caf7ad94c2b10156c34c7b1)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5422>

---

 .pick_status.json                   | 2 +-
 src/amd/addrlib/inc/addrinterface.h | 3 ---
 src/amd/common/ac_surface.c         | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 01786f5aef5..d1fbe4e463a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2398,7 +2398,7 @@
         "description": "amd/addrlib: remove unused members of ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/addrlib/inc/addrinterface.h b/src/amd/addrlib/inc/addrinterface.h
index b640dee272e..c0e370f2be2 100644
--- a/src/amd/addrlib/inc/addrinterface.h
+++ b/src/amd/addrlib/inc/addrinterface.h
@@ -3349,12 +3349,9 @@ typedef struct _ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT
     UINT_32             mipId;               ///< mipmap level id
 
     ADDR2_META_FLAGS    dccKeyFlags;         ///< DCC flags
-    ADDR2_SURFACE_FLAGS colorFlags;          ///< Color surface flags
     AddrResourceType    resourceType;        ///< Color surface type
     AddrSwizzleMode     swizzleMode;         ///< Color surface swizzle mode
     UINT_32             bpp;                 ///< Color surface bits per pixel
-    UINT_32             unalignedWidth;      ///< Color surface original width (of mip0)
-    UINT_32             unalignedHeight;     ///< Color surface original height (of mip0)
     UINT_32             numSlices;           ///< Color surface original slices (of mip0)
     UINT_32             numMipLevels;        ///< Color surface mipmap levels
     UINT_32             numFrags;            ///< Color surface fragment number
diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 1facd6b5c31..992444dd70d 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1348,12 +1348,9 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
 					/* Compute address mapping from non-displayable to displayable DCC. */
 					ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT addrin = {};
 					addrin.size             = sizeof(addrin);
-					addrin.colorFlags.color = 1;
 					addrin.swizzleMode      = din.swizzleMode;
 					addrin.resourceType     = din.resourceType;
 					addrin.bpp              = din.bpp;
-					addrin.unalignedWidth   = din.unalignedWidth;
-					addrin.unalignedHeight  = din.unalignedHeight;
 					addrin.numSlices        = 1;
 					addrin.numMipLevels     = 1;
 					addrin.numFrags         = 1;