64KTileAlignmentFix (#48)

johnmach · web-flow · commit c596541920a3 · 2021-06-17T13:33:37.000+05:30
diff --git a/Source/GmmLib/Texture/GmmTextureAlloc.cpp b/Source/GmmLib/Texture/GmmTextureAlloc.cpp
@@ -813,9 +813,9 @@ GMM_STATUS GmmLib::GmmTextureCalc::FillTexPitchAndSize(GMM_TEXTURE_INFO * pTexIn
     }
 
     if((pTexInfo->Flags.Gpu.TilePool && (GFX_GET_CURRENT_RENDERCORE(pPlatform->Platform) >= IGFX_GEN9_CORE)) ||
-       (pTexInfo->Flags.Info.Undefined64KBSwizzle))
+       (pTexInfo->Flags.Info.Undefined64KBSwizzle) || GMM_IS_64KB_TILE(pTexInfo->Flags))
     {
-        pTexInfo->Alignment.BaseAlignment = GMM_KBYTE(64);
+        pTexInfo->Alignment.BaseAlignment = (GFX_IS_ALIGNED(pTexInfo->Alignment.BaseAlignment, GMM_KBYTE(64))) ? pTexInfo->Alignment.BaseAlignment : GMM_KBYTE(64);
     }
 
     if(pGmmGlobalContext->GetWaTable().WaCompressedResourceRequiresConstVA21 && pTexInfo->Flags.Gpu.MMC)

Original file line number	Diff line number	Diff line change
`@@ -813,9 +813,9 @@ GMM_STATUS GmmLib::GmmTextureCalc::FillTexPitchAndSize(GMM_TEXTURE_INFO * pTexIn`
`813`	`813`	`}`
`814`	`814`
`815`	`815`	`if((pTexInfo->Flags.Gpu.TilePool && (GFX_GET_CURRENT_RENDERCORE(pPlatform->Platform) >= IGFX_GEN9_CORE)) \|\|`
`816`		`- (pTexInfo->Flags.Info.Undefined64KBSwizzle))`
	`816`	`+ (pTexInfo->Flags.Info.Undefined64KBSwizzle) \|\| GMM_IS_64KB_TILE(pTexInfo->Flags))`
`817`	`817`	`{`
`818`		`- pTexInfo->Alignment.BaseAlignment = GMM_KBYTE(64);`
	`818`	`+ pTexInfo->Alignment.BaseAlignment = (GFX_IS_ALIGNED(pTexInfo->Alignment.BaseAlignment, GMM_KBYTE(64))) ? pTexInfo->Alignment.BaseAlignment : GMM_KBYTE(64);`
`819`	`819`	`}`
`820`	`820`
`821`	`821`	`if(pGmmGlobalContext->GetWaTable().WaCompressedResourceRequiresConstVA21 && pTexInfo->Flags.Gpu.MMC)`