On 07/09/2017 09:31 PM, Dave Airlie wrote: > From: Dave Airlie <[email protected]> > > This fixes the misspelling of ALIGNMENTS in addrlib. > > Signed-off-by: Dave Airlie <[email protected]> > --- > src/amd/addrlib/addrinterface.cpp | 2 +- > src/amd/addrlib/addrinterface.h | 6 +++--- > src/amd/addrlib/core/addrlib.cpp | 4 ++-- > src/amd/addrlib/core/addrlib.h | 4 ++-- > src/amd/addrlib/gfx9/gfx9addrlib.cpp | 2 +- > src/amd/addrlib/gfx9/gfx9addrlib.h | 2 +- > src/amd/addrlib/r800/ciaddrlib.cpp | 2 +- > src/amd/addrlib/r800/ciaddrlib.h | 2 +- > src/amd/addrlib/r800/siaddrlib.cpp | 2 +- > src/amd/addrlib/r800/siaddrlib.h | 2 +- > 10 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/src/amd/addrlib/addrinterface.cpp > b/src/amd/addrlib/addrinterface.cpp > index ea2506e..85e298d 100644 > --- a/src/amd/addrlib/addrinterface.cpp > +++ b/src/amd/addrlib/addrinterface.cpp > @@ -1054,7 +1054,7 @@ ADDR_E_RETURNCODE ADDR_API AddrComputePrtInfo( > */ > ADDR_E_RETURNCODE ADDR_API AddrGetMaxAlignments( > ADDR_HANDLE hLib, ///< address lib handle > - ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut) ///< [out] output structure > + ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut) ///< [out] output structure > { > Addr::Lib* pLib = Lib::GetLib(hLib); > > diff --git a/src/amd/addrlib/addrinterface.h b/src/amd/addrlib/addrinterface.h > index c36d465..f5e26b5 100644 > --- a/src/amd/addrlib/addrinterface.h > +++ b/src/amd/addrlib/addrinterface.h > @@ -2301,11 +2301,11 @@ ADDR_E_RETURNCODE ADDR_API AddrComputeDccInfo( > * Output structure of AddrGetMaxAlignments > > **************************************************************************************************** > */ > -typedef struct _ADDR_GET_MAX_ALINGMENTS_OUTPUT > +typedef struct _ADDR_GET_MAX_ALIGNMENTS_OUTPUT
The documentation comment above this symbol is also missing the fix (line 2298 of addrinterface.h) (rgrep is my friend :) With that fixed, patch is: Reviewed-by: Eduardo Lima Mitev <[email protected]> > { > UINT_32 size; ///< Size of this structure in bytes > UINT_64 baseAlign; ///< Maximum base alignment in bytes > -} ADDR_GET_MAX_ALINGMENTS_OUTPUT; > +} ADDR_GET_MAX_ALIGNMENTS_OUTPUT; > > /** > > **************************************************************************************************** > @@ -2317,7 +2317,7 @@ typedef struct _ADDR_GET_MAX_ALINGMENTS_OUTPUT > */ > ADDR_E_RETURNCODE ADDR_API AddrGetMaxAlignments( > ADDR_HANDLE hLib, > - ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut); > + ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut); > > > > diff --git a/src/amd/addrlib/core/addrlib.cpp > b/src/amd/addrlib/core/addrlib.cpp > index b86fd81..65fd345 100644 > --- a/src/amd/addrlib/core/addrlib.cpp > +++ b/src/amd/addrlib/core/addrlib.cpp > @@ -356,14 +356,14 @@ Lib* Lib::GetLib( > > **************************************************************************************************** > */ > ADDR_E_RETURNCODE Lib::GetMaxAlignments( > - ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut ///< [out] output structure > + ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut ///< [out] output structure > ) const > { > ADDR_E_RETURNCODE returnCode = ADDR_OK; > > if (GetFillSizeFieldsFlags() == TRUE) > { > - if (pOut->size != sizeof(ADDR_GET_MAX_ALINGMENTS_OUTPUT)) > + if (pOut->size != sizeof(ADDR_GET_MAX_ALIGNMENTS_OUTPUT)) > { > returnCode = ADDR_PARAMSIZEMISMATCH; > } > diff --git a/src/amd/addrlib/core/addrlib.h b/src/amd/addrlib/core/addrlib.h > index 736604e..2070084 100644 > --- a/src/amd/addrlib/core/addrlib.h > +++ b/src/amd/addrlib/core/addrlib.h > @@ -169,14 +169,14 @@ public: > > BOOL_32 GetExportNorm(const ELEM_GETEXPORTNORM_INPUT* pIn) const; > > - ADDR_E_RETURNCODE GetMaxAlignments(ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut) > const; > + ADDR_E_RETURNCODE GetMaxAlignments(ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut) > const; > > protected: > Lib(); // Constructor is protected > Lib(const Client* pClient); > > /// Pure virtual function to get max alignments > - virtual ADDR_E_RETURNCODE > HwlGetMaxAlignments(ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut) const = 0; > + virtual ADDR_E_RETURNCODE > HwlGetMaxAlignments(ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut) const = 0; > > // > // Initialization > diff --git a/src/amd/addrlib/gfx9/gfx9addrlib.cpp > b/src/amd/addrlib/gfx9/gfx9addrlib.cpp > index 9b25371..57ecb05 100644 > --- a/src/amd/addrlib/gfx9/gfx9addrlib.cpp > +++ b/src/amd/addrlib/gfx9/gfx9addrlib.cpp > @@ -663,7 +663,7 @@ ADDR_E_RETURNCODE Gfx9Lib::HwlComputeDccInfo( > > ************************************************************************************************************************ > */ > ADDR_E_RETURNCODE Gfx9Lib::HwlGetMaxAlignments( > - ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut ///< [out] output structure > + ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut ///< [out] output structure > ) const > { > pOut->baseAlign = HwlComputeSurfaceBaseAlign(ADDR_SW_64KB); > diff --git a/src/amd/addrlib/gfx9/gfx9addrlib.h > b/src/amd/addrlib/gfx9/gfx9addrlib.h > index 9623610..b7d1287 100644 > --- a/src/amd/addrlib/gfx9/gfx9addrlib.h > +++ b/src/amd/addrlib/gfx9/gfx9addrlib.h > @@ -374,7 +374,7 @@ protected: > > private: > virtual ADDR_E_RETURNCODE HwlGetMaxAlignments( > - ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut) const; > + ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut) const; > > virtual BOOL_32 HwlInitGlobalParams( > const ADDR_CREATE_INPUT* pCreateIn); > diff --git a/src/amd/addrlib/r800/ciaddrlib.cpp > b/src/amd/addrlib/r800/ciaddrlib.cpp > index fe965b8..5dd52dd 100644 > --- a/src/amd/addrlib/r800/ciaddrlib.cpp > +++ b/src/amd/addrlib/r800/ciaddrlib.cpp > @@ -2177,7 +2177,7 @@ VOID CiLib::HwlPadDimensions( > > **************************************************************************************************** > */ > ADDR_E_RETURNCODE CiLib::HwlGetMaxAlignments( > - ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut ///< [out] output structure > + ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut ///< [out] output structure > ) const > { > const UINT_32 pipes = HwlGetPipes(&m_tileTable[0].info); > diff --git a/src/amd/addrlib/r800/ciaddrlib.h > b/src/amd/addrlib/r800/ciaddrlib.h > index 7e331dd..3c838df 100644 > --- a/src/amd/addrlib/r800/ciaddrlib.h > +++ b/src/amd/addrlib/r800/ciaddrlib.h > @@ -168,7 +168,7 @@ protected: > const ADDR_COMPUTE_HTILE_ADDRFROMCOORD_INPUT* pIn, > ADDR_COMPUTE_HTILE_ADDRFROMCOORD_OUTPUT* pOut) const; > > - virtual ADDR_E_RETURNCODE > HwlGetMaxAlignments(ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut) const; > + virtual ADDR_E_RETURNCODE > HwlGetMaxAlignments(ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut) const; > > virtual VOID HwlPadDimensions( > AddrTileMode tileMode, UINT_32 bpp, ADDR_SURFACE_FLAGS flags, > diff --git a/src/amd/addrlib/r800/siaddrlib.cpp > b/src/amd/addrlib/r800/siaddrlib.cpp > index ffa5488..9ee1335 100644 > --- a/src/amd/addrlib/r800/siaddrlib.cpp > +++ b/src/amd/addrlib/r800/siaddrlib.cpp > @@ -3483,7 +3483,7 @@ VOID SiLib::HwlSelectTileMode( > > **************************************************************************************************** > */ > ADDR_E_RETURNCODE SiLib::HwlGetMaxAlignments( > - ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut ///< [out] output structure > + ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut ///< [out] output structure > ) const > { > const UINT_32 pipes = HwlGetPipes(&m_tileTable[0].info); > diff --git a/src/amd/addrlib/r800/siaddrlib.h > b/src/amd/addrlib/r800/siaddrlib.h > index 37e26ff..faf63fd 100644 > --- a/src/amd/addrlib/r800/siaddrlib.h > +++ b/src/amd/addrlib/r800/siaddrlib.h > @@ -245,7 +245,7 @@ protected: > return TRUE; > } > > - virtual ADDR_E_RETURNCODE > HwlGetMaxAlignments(ADDR_GET_MAX_ALINGMENTS_OUTPUT* pOut) const; > + virtual ADDR_E_RETURNCODE > HwlGetMaxAlignments(ADDR_GET_MAX_ALIGNMENTS_OUTPUT* pOut) const; > > virtual VOID HwlComputeSurfaceAlignmentsMacroTiled( > AddrTileMode tileMode, UINT_32 bpp, ADDR_SURFACE_FLAGS flags, > _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
