Removed excess checks before delete/free and remove unused vars

This commit is contained in:
Herman Semenov 2024-07-05 09:14:55 -05:00
parent a999c848a4
commit 02bfa6bfa9
5 changed files with 3 additions and 42 deletions

View File

@ -750,10 +750,7 @@ GMM_PAGETABLE_MGR* GMM_STDCALL GmmLib::GmmClientContext::CreatePageTblMgrObject(
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
void GMM_STDCALL GmmLib::GmmClientContext::DestroyPageTblMgrObject(GMM_PAGETABLE_MGR* pPageTableMgr) void GMM_STDCALL GmmLib::GmmClientContext::DestroyPageTblMgrObject(GMM_PAGETABLE_MGR* pPageTableMgr)
{ {
if (pPageTableMgr) delete pPageTableMgr;
{
delete pPageTableMgr;
}
} }
#ifdef GMM_LIB_DLL #ifdef GMM_LIB_DLL

View File

@ -697,14 +697,8 @@ GmmLib::GmmPageTableMgr::~GmmPageTableMgr()
if(AuxTTObj) if(AuxTTObj)
{ {
if(AuxTTObj->NullL1Table) delete AuxTTObj->NullL1Table;
{ delete AuxTTObj->NullL2Table;
delete AuxTTObj->NullL1Table;
}
if(AuxTTObj->NullL2Table)
{
delete AuxTTObj->NullL2Table;
}
AuxTTObj->DestroyL3Table(); AuxTTObj->DestroyL3Table();
delete AuxTTObj; delete AuxTTObj;
AuxTTObj = NULL; AuxTTObj = NULL;

View File

@ -2839,17 +2839,6 @@ TEST_F(CTestGen12Resource, Test2DTileYfAMFSResource)
/// @brief ULT for MSAA Resource - TODO adddepth MSAA, MCS surf param verificaton, compression case /// @brief ULT for MSAA Resource - TODO adddepth MSAA, MCS surf param verificaton, compression case
TEST_F(CTestGen12Resource, TestColorMSAA) TEST_F(CTestGen12Resource, TestColorMSAA)
{ {
//Tile dimensions in Bytes
const uint32_t MCSTileSize[1][2] = {128, 32}; //MCS is TileY
const uint32_t TestDimensions[4][2] = {
//Input dimensions in #Tiles
{15, 20}, //16 Tiles x 20 <Max Width: Depth MSS crosses Pitch limit beyond this>
{0, 0}, //1x1x1
{1, 0}, //2 Tilesx1
{1, 1}, //2 Tiles x 2
};
uint32_t TestArraySize[2] = {1, 5}; uint32_t TestArraySize[2] = {1, 5};
uint32_t MinPitch = 32; uint32_t MinPitch = 32;

View File

@ -1460,10 +1460,6 @@ TEST_F(CTestGen12dGPUResource, DISABLED_TestPlanarYCompressedResource)
/// @brief ULT for Planar Ys Compressed resource /// @brief ULT for Planar Ys Compressed resource
TEST_F(CTestGen12dGPUResource, TestPlanarTile64CompressedResource) TEST_F(CTestGen12dGPUResource, TestPlanarTile64CompressedResource)
{ {
const uint32_t TileSize[TEST_BPP_MAX][2] = {
{256, 256}, {512, 128}, {512, 128}, {1024, 64}, {1024, 64}}; // TileYS
GMM_RESCREATE_PARAMS gmmParams = {}; GMM_RESCREATE_PARAMS gmmParams = {};
gmmParams.Type = RESOURCE_2D; gmmParams.Type = RESOURCE_2D;
gmmParams.NoGfxMemory = 1; gmmParams.NoGfxMemory = 1;
@ -3124,17 +3120,6 @@ TEST_F(CTestGen12dGPUResource, DISABLED_Test2DTileYfAMFSResource)
/// @brief ULT for MSAA Resource - adddepth MSAA, MCS surf param verificaton, compression case /// @brief ULT for MSAA Resource - adddepth MSAA, MCS surf param verificaton, compression case
TEST_F(CTestGen12dGPUResource, DISABLED_TestColorMSAA) TEST_F(CTestGen12dGPUResource, DISABLED_TestColorMSAA)
{ {
//Tile dimensions in Bytes
const uint32_t MCSTileSize[1][2] = {128, 32}; //MCS is TileY
const uint32_t TestDimensions[4][2] = {
//Input dimensions in #Tiles
{15, 20}, //16 Tiles x 20 <Max Width: Depth MSS crosses Pitch limit beyond this>
{0, 0}, //1x1x1
{1, 0}, //2 Tilesx1
{1, 1}, //2 Tiles x 2
};
uint32_t TestArraySize[2] = {1, 5}; uint32_t TestArraySize[2] = {1, 5};
uint32_t MinPitch = 32; uint32_t MinPitch = 32;

View File

@ -2353,10 +2353,6 @@ TEST_F(CTestGen9Resource, Test3DTileYsResource)
/// @brief ULT for 3D TileYs Mipped Resource /// @brief ULT for 3D TileYs Mipped Resource
TEST_F(CTestGen9Resource, Test3DTileYsMippedResource) TEST_F(CTestGen9Resource, Test3DTileYsMippedResource)
{ {
// Horizontal/Vertical pixel alignment
const uint32_t HAlign[TEST_BPP_MAX] = {64, 32, 32, 32, 16};
const uint32_t VAlign[TEST_BPP_MAX] = {32, 32, 32, 16, 16};
const uint32_t TileSize[TEST_BPP_MAX][3] = {{64, 32, 32}, const uint32_t TileSize[TEST_BPP_MAX][3] = {{64, 32, 32},
{64, 32, 32}, {64, 32, 32},
{128, 32, 16}, {128, 32, 16},