From 02bfa6bfa90d78a1bb0e22f30cc37486c2b3857d Mon Sep 17 00:00:00 2001
From: Herman Semenov <GermanAizek@yandex.ru>
Date: Fri, 5 Jul 2024 09:14:55 -0500
Subject: [PATCH] Removed excess checks before delete/free and remove unused
vars
---
Source/GmmLib/GlobalInfo/GmmClientContext.cpp | 5 +----
.../GmmLib/TranslationTable/GmmPageTableMgr.cpp | 10 ++--------
Source/GmmLib/ULT/GmmGen12ResourceULT.cpp | 11 -----------
Source/GmmLib/ULT/GmmGen12dGPUResourceULT.cpp | 15 ---------------
Source/GmmLib/ULT/GmmGen9ResourceULT.cpp | 4 ----
5 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/Source/GmmLib/GlobalInfo/GmmClientContext.cpp b/Source/GmmLib/GlobalInfo/GmmClientContext.cpp
index 8215295..ad6ccb9 100644
--- a/Source/GmmLib/GlobalInfo/GmmClientContext.cpp
+++ b/Source/GmmLib/GlobalInfo/GmmClientContext.cpp
@@ -750,10 +750,7 @@ GMM_PAGETABLE_MGR* GMM_STDCALL GmmLib::GmmClientContext::CreatePageTblMgrObject(
/////////////////////////////////////////////////////////////////////////////////////
void GMM_STDCALL GmmLib::GmmClientContext::DestroyPageTblMgrObject(GMM_PAGETABLE_MGR* pPageTableMgr)
{
- if (pPageTableMgr)
- {
- delete pPageTableMgr;
- }
+ delete pPageTableMgr;
}
#ifdef GMM_LIB_DLL
diff --git a/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp b/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp
index 041b42e..7b2246d 100644
--- a/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp
+++ b/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp
@@ -697,14 +697,8 @@ GmmLib::GmmPageTableMgr::~GmmPageTableMgr()
if(AuxTTObj)
{
- if(AuxTTObj->NullL1Table)
- {
- delete AuxTTObj->NullL1Table;
- }
- if(AuxTTObj->NullL2Table)
- {
- delete AuxTTObj->NullL2Table;
- }
+ delete AuxTTObj->NullL1Table;
+ delete AuxTTObj->NullL2Table;
AuxTTObj->DestroyL3Table();
delete AuxTTObj;
AuxTTObj = NULL;
diff --git a/Source/GmmLib/ULT/GmmGen12ResourceULT.cpp b/Source/GmmLib/ULT/GmmGen12ResourceULT.cpp
index c0c05e7..74f0d93 100644
--- a/Source/GmmLib/ULT/GmmGen12ResourceULT.cpp
+++ b/Source/GmmLib/ULT/GmmGen12ResourceULT.cpp
@@ -2839,17 +2839,6 @@ TEST_F(CTestGen12Resource, Test2DTileYfAMFSResource)
/// @brief ULT for MSAA Resource - TODO adddepth MSAA, MCS surf param verificaton, compression case
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 MinPitch = 32;
diff --git a/Source/GmmLib/ULT/GmmGen12dGPUResourceULT.cpp b/Source/GmmLib/ULT/GmmGen12dGPUResourceULT.cpp
index 5031cd9..1aca4a7 100644
--- a/Source/GmmLib/ULT/GmmGen12dGPUResourceULT.cpp
+++ b/Source/GmmLib/ULT/GmmGen12dGPUResourceULT.cpp
@@ -1460,10 +1460,6 @@ TEST_F(CTestGen12dGPUResource, DISABLED_TestPlanarYCompressedResource)
/// @brief ULT for Planar Ys Compressed resource
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 = {};
gmmParams.Type = RESOURCE_2D;
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
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 MinPitch = 32;
diff --git a/Source/GmmLib/ULT/GmmGen9ResourceULT.cpp b/Source/GmmLib/ULT/GmmGen9ResourceULT.cpp
index a7be6be..ca95281 100644
--- a/Source/GmmLib/ULT/GmmGen9ResourceULT.cpp
+++ b/Source/GmmLib/ULT/GmmGen9ResourceULT.cpp
@@ -2353,10 +2353,6 @@ TEST_F(CTestGen9Resource, Test3DTileYsResource)
/// @brief ULT for 3D TileYs Mipped Resource
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},
{64, 32, 32},
{128, 32, 16},