Skip to content

Commit 15ae0f7

Browse files
committed
Initialize variable and remove condition for Ftr check
Change-Id: Ie166aea0b96610518e27a4178174c2564b94e21c
1 parent 24c030f commit 15ae0f7

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

Source/GmmLib/inc/External/Common/GmmResourceInfoCommon.h

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ namespace GmmLib
12601260
/////////////////////////////////////////////////////////////////////////////////////
12611261
GMM_INLINE_VIRTUAL GMM_INLINE_EXPORTED uint32_t GMM_STDCALL GetHAlignSurfaceState()
12621262
{
1263-
uint32_t HAlign;
1263+
uint32_t HAlign = 0;
12641264
const GMM_PLATFORM_INFO *pPlatform;
12651265

12661266
pPlatform = (GMM_PLATFORM_INFO *)GMM_OVERRIDE_EXPORTED_PLATFORM_INFO(&Surf);
@@ -1273,15 +1273,12 @@ namespace GmmLib
12731273
}
12741274
else
12751275
{
1276-
if(GMM_IS_TILEY)
1276+
switch (GetHAlign())
12771277
{
1278-
switch (GetHAlign())
1279-
{
1280-
case 4: HAlign = 1; break;
1281-
case 8: HAlign = 2; break;
1282-
case 16: HAlign = 3; break;
1283-
default: HAlign = 0; __GMM_ASSERT(0);
1284-
}
1278+
case 4: HAlign = 1; break;
1279+
case 8: HAlign = 2; break;
1280+
case 16: HAlign = 3; break;
1281+
default: HAlign = 0; __GMM_ASSERT(0);
12851282
}
12861283
}
12871284
}
@@ -1348,15 +1345,12 @@ namespace GmmLib
13481345
{
13491346
uint32_t TiledMode = 0;
13501347

1351-
if(GMM_IS_TILEY)
1352-
{
1353-
TiledMode =
1354-
Surf.Flags.Info.Linear ? 0 :
1355-
Surf.Flags.Info.TiledX ? 2 :
1356-
/* Y/YF/YS */ 3;
1348+
TiledMode =
1349+
Surf.Flags.Info.Linear ? 0 :
1350+
Surf.Flags.Info.TiledX ? 2 :
1351+
/* Y/YF/YS */ 3;
13571352

1358-
__GMM_ASSERT((TiledMode != 3) || (Surf.Flags.Info.TiledY || Surf.Flags.Info.TiledYf || Surf.Flags.Info.TiledYs));
1359-
}
1353+
__GMM_ASSERT((TiledMode != 3) || (Surf.Flags.Info.TiledY || Surf.Flags.Info.TiledYf || Surf.Flags.Info.TiledYs));
13601354

13611355
return TiledMode;
13621356
}

0 commit comments

Comments
 (0)