OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

amd/addrlib: Clean up unused colorFlags argument

Browse Source 
Cleanup.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5865>
This commit is contained in:
Bas Nieuwenhuizen
2020-07-11 14:34:58 +02:00
committed by Marge Bot
parent a37aeb128d
commit 862d85a63f
4 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/addrlib/inc/addrinterface.h
View File

@@ -2872,7 +2872,6 @@ typedef struct _ADDR2_COMPUTE_CMASKINFO_INPUT
UINT_32 size; ///< Size of this structure in bytes UINT_32 size; ///< Size of this structure in bytes
ADDR2_META_FLAGS cMaskFlags; ///< CMASK flags ADDR2_META_FLAGS cMaskFlags; ///< CMASK flags
ADDR2_SURFACE_FLAGS colorFlags; ///< Color surface flags
AddrResourceType resourceType; ///< Color surface type AddrResourceType resourceType; ///< Color surface type
AddrSwizzleMode swizzleMode; ///< FMask surface swizzle mode AddrSwizzleMode swizzleMode; ///< FMask surface swizzle mode
UINT_32 unalignedWidth; ///< Color surface original width UINT_32 unalignedWidth; ///< Color surface original width
@@ -2943,7 +2942,6 @@ typedef struct _ADDR2_COMPUTE_CMASK_ADDRFROMCOORD_INPUT
UINT_32 slice; ///< Index of slices UINT_32 slice; ///< Index of slices
ADDR2_META_FLAGS cMaskFlags; ///< CMASK flags ADDR2_META_FLAGS cMaskFlags; ///< CMASK flags
ADDR2_SURFACE_FLAGS colorFlags; ///< Color surface flags
AddrResourceType resourceType; ///< Color surface type AddrResourceType resourceType; ///< Color surface type
AddrSwizzleMode swizzleMode; ///< FMask surface swizzle mode 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 UINT_32 bitPosition; ///< Bit position within addr, 0 or 4
ADDR2_META_FLAGS cMaskFlags; ///< CMASK flags ADDR2_META_FLAGS cMaskFlags; ///< CMASK flags
ADDR2_SURFACE_FLAGS colorFlags; ///< Color surface flags
AddrResourceType resourceType; ///< Color surface type AddrResourceType resourceType; ///< Color surface type
AddrSwizzleMode swizzleMode; ///< FMask surface swizzle mode 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 UINT_32 size; ///< Size of this structure in bytes
ADDR2_META_FLAGS dccKeyFlags; ///< DCC key flags ADDR2_META_FLAGS dccKeyFlags; ///< DCC key flags
ADDR2_SURFACE_FLAGS colorFlags; ///< Color surface flags
AddrResourceType resourceType; ///< Color surface type AddrResourceType resourceType; ///< Color surface type
AddrSwizzleMode swizzleMode; ///< Color surface swizzle mode AddrSwizzleMode swizzleMode; ///< Color surface swizzle mode
UINT_32 bpp; ///< bits per pixel UINT_32 bpp; ///< bits per pixel

1
src/amd/addrlib/src/gfx10/gfx10addrlib.cpp
View File

@@ -513,7 +513,6 @@ ADDR_E_RETURNCODE Gfx10Lib::HwlComputeCmaskAddrFromCoord(
ADDR2_COMPUTE_CMASK_INFO_INPUT input = {}; ADDR2_COMPUTE_CMASK_INFO_INPUT input = {};
input.size = sizeof(input); input.size = sizeof(input);
input.cMaskFlags = pIn->cMaskFlags; input.cMaskFlags = pIn->cMaskFlags;
input.colorFlags = pIn->colorFlags;
input.unalignedWidth = Max(pIn->unalignedWidth, 1u); input.unalignedWidth = Max(pIn->unalignedWidth, 1u);
input.unalignedHeight = Max(pIn->unalignedHeight, 1u); input.unalignedHeight = Max(pIn->unalignedHeight, 1u);
input.numSlices = Max(pIn->numSlices, 1u); input.numSlices = Max(pIn->numSlices, 1u);

1
src/amd/addrlib/src/gfx9/gfx9addrlib.cpp
View File

@@ -766,7 +766,6 @@ ADDR_E_RETURNCODE Gfx9Lib::HwlComputeCmaskAddrFromCoord(
ADDR2_COMPUTE_CMASK_INFO_INPUT input = {0}; ADDR2_COMPUTE_CMASK_INFO_INPUT input = {0};
input.size = sizeof(input); input.size = sizeof(input);
input.cMaskFlags = pIn->cMaskFlags; input.cMaskFlags = pIn->cMaskFlags;
input.colorFlags = pIn->colorFlags;
input.unalignedWidth = Max(pIn->unalignedWidth, 1u); input.unalignedWidth = Max(pIn->unalignedWidth, 1u);
input.unalignedHeight = Max(pIn->unalignedHeight, 1u); input.unalignedHeight = Max(pIn->unalignedHeight, 1u);
input.numSlices = Max(pIn->numSlices, 1u); input.numSlices = Max(pIn->numSlices, 1u);

2
src/amd/common/ac_surface.c
View File

@@ -1571,7 +1571,6 @@ static int gfx9_compute_miptree(struct ac_addrlib *addrlib,
din.dccKeyFlags.pipeAligned = !in->flags.metaPipeUnaligned; din.dccKeyFlags.pipeAligned = !in->flags.metaPipeUnaligned;
din.dccKeyFlags.rbAligned = !in->flags.metaRbUnaligned; din.dccKeyFlags.rbAligned = !in->flags.metaRbUnaligned;
din.colorFlags = in->flags;
din.resourceType = in->resourceType; din.resourceType = in->resourceType;
din.swizzleMode = in->swizzleMode; din.swizzleMode = in->swizzleMode;
din.bpp = in->bpp; din.bpp = in->bpp;
@@ -1830,7 +1829,6 @@ static int gfx9_compute_miptree(struct ac_addrlib *addrlib,
cin.cMaskFlags.pipeAligned = 1; cin.cMaskFlags.pipeAligned = 1;
cin.cMaskFlags.rbAligned = 1; cin.cMaskFlags.rbAligned = 1;
cin.colorFlags = in->flags;
cin.resourceType = in->resourceType; cin.resourceType = in->resourceType;
cin.unalignedWidth = in->width; cin.unalignedWidth = in->width;
cin.unalignedHeight = in->height; cin.unalignedHeight = in->height;