From 862d85a63ff6942bc0d30ea3bb42a66433d3c936 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sat, 11 Jul 2020 14:34:58 +0200 Subject: [PATCH] amd/addrlib: Clean up unused colorFlags argument MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Cleanup. Reviewed-by: Marek Olšák Part-of: --- src/amd/addrlib/inc/addrinterface.h | 4 ---- src/amd/addrlib/src/gfx10/gfx10addrlib.cpp | 1 - src/amd/addrlib/src/gfx9/gfx9addrlib.cpp | 1 - src/amd/common/ac_surface.c | 2 -- 4 files changed, 8 deletions(-) diff --git a/src/amd/addrlib/inc/addrinterface.h b/src/amd/addrlib/inc/addrinterface.h index c0e370f2be2..98581e08bb9 100644 --- a/src/amd/addrlib/inc/addrinterface.h +++ b/src/amd/addrlib/inc/addrinterface.h @@ -2872,7 +2872,6 @@ typedef struct _ADDR2_COMPUTE_CMASKINFO_INPUT UINT_32 size; ///< Size of this structure in bytes ADDR2_META_FLAGS cMaskFlags; ///< CMASK flags - ADDR2_SURFACE_FLAGS colorFlags; ///< Color surface flags AddrResourceType resourceType; ///< Color surface type AddrSwizzleMode swizzleMode; ///< FMask surface swizzle mode UINT_32 unalignedWidth; ///< Color surface original width @@ -2943,7 +2942,6 @@ typedef struct _ADDR2_COMPUTE_CMASK_ADDRFROMCOORD_INPUT UINT_32 slice; ///< Index of slices ADDR2_META_FLAGS cMaskFlags; ///< CMASK flags - ADDR2_SURFACE_FLAGS colorFlags; ///< Color surface flags AddrResourceType resourceType; ///< Color surface type AddrSwizzleMode swizzleMode; ///< FMask surface swizzle mode @@ -3002,7 +3000,6 @@ typedef struct _ADDR2_COMPUTE_CMASK_COORDFROMADDR_INPUT UINT_32 bitPosition; ///< Bit position within addr, 0 or 4 ADDR2_META_FLAGS cMaskFlags; ///< CMASK flags - ADDR2_SURFACE_FLAGS colorFlags; ///< Color surface flags AddrResourceType resourceType; ///< Color surface type AddrSwizzleMode swizzleMode; ///< FMask surface swizzle mode @@ -3260,7 +3257,6 @@ typedef struct _ADDR2_COMPUTE_DCCINFO_INPUT UINT_32 size; ///< Size of this structure in bytes ADDR2_META_FLAGS dccKeyFlags; ///< DCC key flags - ADDR2_SURFACE_FLAGS colorFlags; ///< Color surface flags AddrResourceType resourceType; ///< Color surface type AddrSwizzleMode swizzleMode; ///< Color surface swizzle mode UINT_32 bpp; ///< bits per pixel diff --git a/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp b/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp index ec05f3a3dd8..454f57543d4 100644 --- a/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp +++ b/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp @@ -513,7 +513,6 @@ ADDR_E_RETURNCODE Gfx10Lib::HwlComputeCmaskAddrFromCoord( ADDR2_COMPUTE_CMASK_INFO_INPUT input = {}; input.size = sizeof(input); input.cMaskFlags = pIn->cMaskFlags; - input.colorFlags = pIn->colorFlags; input.unalignedWidth = Max(pIn->unalignedWidth, 1u); input.unalignedHeight = Max(pIn->unalignedHeight, 1u); input.numSlices = Max(pIn->numSlices, 1u); diff --git a/src/amd/addrlib/src/gfx9/gfx9addrlib.cpp b/src/amd/addrlib/src/gfx9/gfx9addrlib.cpp index dcc080cbec4..122471fb0d7 100644 --- a/src/amd/addrlib/src/gfx9/gfx9addrlib.cpp +++ b/src/amd/addrlib/src/gfx9/gfx9addrlib.cpp @@ -766,7 +766,6 @@ ADDR_E_RETURNCODE Gfx9Lib::HwlComputeCmaskAddrFromCoord( ADDR2_COMPUTE_CMASK_INFO_INPUT input = {0}; input.size = sizeof(input); input.cMaskFlags = pIn->cMaskFlags; - input.colorFlags = pIn->colorFlags; input.unalignedWidth = Max(pIn->unalignedWidth, 1u); input.unalignedHeight = Max(pIn->unalignedHeight, 1u); input.numSlices = Max(pIn->numSlices, 1u); diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 1681705b4a4..41fb152d5a9 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -1571,7 +1571,6 @@ static int gfx9_compute_miptree(struct ac_addrlib *addrlib, din.dccKeyFlags.pipeAligned = !in->flags.metaPipeUnaligned; din.dccKeyFlags.rbAligned = !in->flags.metaRbUnaligned; - din.colorFlags = in->flags; din.resourceType = in->resourceType; din.swizzleMode = in->swizzleMode; din.bpp = in->bpp; @@ -1830,7 +1829,6 @@ static int gfx9_compute_miptree(struct ac_addrlib *addrlib, cin.cMaskFlags.pipeAligned = 1; cin.cMaskFlags.rbAligned = 1; - cin.colorFlags = in->flags; cin.resourceType = in->resourceType; cin.unalignedWidth = in->width; cin.unalignedHeight = in->height; -- 2.30.2