projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
amd: update addrlib
[mesa.git]
/
src
/
amd
/
addrlib
/
src
/
r800
/
ciaddrlib.cpp
diff --git
a/src/amd/addrlib/src/r800/ciaddrlib.cpp
b/src/amd/addrlib/src/r800/ciaddrlib.cpp
index 5bec09184718b031d63b5f5fd63f787318a9c54a..5a83e7153011267c467bb3ee7bad863b09f460f3 100644
(file)
--- a/
src/amd/addrlib/src/r800/ciaddrlib.cpp
+++ b/
src/amd/addrlib/src/r800/ciaddrlib.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright © 2007-201
8
Advanced Micro Devices, Inc.
+ * Copyright © 2007-201
9
Advanced Micro Devices, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
@@
-210,7
+210,7
@@
ADDR_E_RETURNCODE CiLib::HwlComputeDccInfo(
{
ADDR_E_RETURNCODE returnCode = ADDR_OK;
{
ADDR_E_RETURNCODE returnCode = ADDR_OK;
- if (
m_settings.isVolcanicIslands
&& IsMacroTiled(pIn->tileMode))
+ if (
SupportDccAndTcCompatibility()
&& IsMacroTiled(pIn->tileMode))
{
UINT_64 dccFastClearSize = pIn->colorSurfSize >> 8;
{
UINT_64 dccFastClearSize = pIn->colorSurfSize >> 8;
@@
-294,7
+294,7
@@
ADDR_E_RETURNCODE CiLib::HwlComputeCmaskAddrFromCoord(
{
ADDR_E_RETURNCODE returnCode = ADDR_NOTSUPPORTED;
{
ADDR_E_RETURNCODE returnCode = ADDR_NOTSUPPORTED;
- if ((
m_settings.isVolcanicIslands
== TRUE) &&
+ if ((
SupportDccAndTcCompatibility()
== TRUE) &&
(pIn->flags.tcCompatible == TRUE))
{
UINT_32 numOfPipes = HwlGetPipes(pIn->pTileInfo);
(pIn->flags.tcCompatible == TRUE))
{
UINT_32 numOfPipes = HwlGetPipes(pIn->pTileInfo);
@@
-338,7
+338,7
@@
ADDR_E_RETURNCODE CiLib::HwlComputeHtileAddrFromCoord(
{
ADDR_E_RETURNCODE returnCode = ADDR_NOTSUPPORTED;
{
ADDR_E_RETURNCODE returnCode = ADDR_NOTSUPPORTED;
- if ((
m_settings.isVolcanicIslands
== TRUE) &&
+ if ((
SupportDccAndTcCompatibility()
== TRUE) &&
(pIn->flags.tcCompatible == TRUE))
{
UINT_32 numOfPipes = HwlGetPipes(pIn->pTileInfo);
(pIn->flags.tcCompatible == TRUE))
{
UINT_32 numOfPipes = HwlGetPipes(pIn->pTileInfo);
@@
-709,7
+709,7
@@
ADDR_E_RETURNCODE CiLib::HwlComputeSurfaceInfo(
if ((pIn->mipLevel > 0) &&
(pOut->tcCompatible == TRUE) &&
(pOut->tileMode != pIn->tileMode) &&
if ((pIn->mipLevel > 0) &&
(pOut->tcCompatible == TRUE) &&
(pOut->tileMode != pIn->tileMode) &&
- (
m_settings.isVolcanicIslands
== TRUE))
+ (
SupportDccAndTcCompatibility()
== TRUE))
{
pOut->tcCompatible = CheckTcCompatibility(pOut->pTileInfo, pIn->bpp, pOut->tileMode, pOut->tileType, pOut);
}
{
pOut->tcCompatible = CheckTcCompatibility(pOut->pTileInfo, pIn->bpp, pOut->tileMode, pOut->tileType, pOut);
}
@@
-1303,7
+1303,7
@@
VOID CiLib::HwlSetupTileInfo(
}
// tcCompatible flag is only meaningful for gfx8.
}
// tcCompatible flag is only meaningful for gfx8.
- if (
m_settings.isVolcanicIslands
== FALSE)
+ if (
SupportDccAndTcCompatibility()
== FALSE)
{
flags.tcCompatible = FALSE;
}
{
flags.tcCompatible = FALSE;
}
@@
-2098,7
+2098,7
@@
VOID CiLib::HwlPadDimensions(
UINT_32 heightAlign ///< [in] height alignment
) const
{
UINT_32 heightAlign ///< [in] height alignment
) const
{
- if ((
m_settings.isVolcanicIslands
== TRUE) &&
+ if ((
SupportDccAndTcCompatibility()
== TRUE) &&
(flags.dccCompatible == TRUE) &&
(numSamples > 1) &&
(mipLevel == 0) &&
(flags.dccCompatible == TRUE) &&
(numSamples > 1) &&
(mipLevel == 0) &&
@@
-2208,7
+2208,7
@@
UINT_32 CiLib::HwlComputeMaxMetaBaseAlignments() const
for (UINT_32 i = 0; i < m_noOfMacroEntries; i++)
{
for (UINT_32 i = 0; i < m_noOfMacroEntries; i++)
{
- if (
(m_settings.isVolcanicIslands
) && IsMacroTiled(m_tileTable[i].mode))
+ if (
SupportDccAndTcCompatibility(
) && IsMacroTiled(m_tileTable[i].mode))
{
maxBank = Max(maxBank, m_macroTileTable[i].banks);
}
{
maxBank = Max(maxBank, m_macroTileTable[i].banks);
}