From 623cc99145002c7e0e81e1cb0fc5cbe91c659289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 10 Jul 2021 11:42:33 +0200
Subject: [PATCH] Minor cleanup

---
 Core/HLE/HLE.h                    | 1 +
 Core/HLE/sceKernelThread.cpp      | 2 +-
 GPU/Common/TextureCacheCommon.cpp | 8 ++++----
 GPU/Common/TextureCacheCommon.h   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Core/HLE/HLE.h b/Core/HLE/HLE.h
index 7a89618015..4f589aaf23 100644
--- a/Core/HLE/HLE.h
+++ b/Core/HLE/HLE.h
@@ -220,6 +220,7 @@ T hleDoLog(LogTypes::LOG_TYPE t, LogTypes::LOG_LEVELS level, T res, const char *
 #define hleLogError(t, res, ...) hleLogHelper(t, LERROR, res, 'x', ##__VA_ARGS__)
 #define hleLogWarning(t, res, ...) hleLogHelper(t, LWARNING, res, 'x', ##__VA_ARGS__)
 #define hleLogDebug(t, res, ...) hleLogHelper(t, HLE_LOG_LDEBUG, res, 'x', ##__VA_ARGS__)
+#define hleLogVerbose(t, res, ...) hleLogHelper(t, HLE_LOG_LVERBOSE, res, 'x', ##__VA_ARGS__)
 #define hleLogSuccessX(t, res, ...) hleLogHelper(t, HLE_LOG_LDEBUG, res, 'x', ##__VA_ARGS__)
 #define hleLogSuccessI(t, res, ...) hleLogHelper(t, HLE_LOG_LDEBUG, res, 'i', ##__VA_ARGS__)
 #define hleLogSuccessInfoX(t, res, ...) hleLogHelper(t, LINFO, res, 'x', ##__VA_ARGS__)
diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp
index 89e58a93e1..58a9582b7f 100644
--- a/Core/HLE/sceKernelThread.cpp
+++ b/Core/HLE/sceKernelThread.cpp
@@ -1344,7 +1344,7 @@ int __KernelGetThreadExitStatus(SceUID threadID) {
 	if (t->nt.status == THREADSTATUS_DORMANT) {
 		return hleLogSuccessI(SCEKERNEL, t->nt.exitStatus);
 	}
-	return hleLogDebug(SCEKERNEL, SCE_KERNEL_ERROR_NOT_DORMANT, "not dormant");
+	return hleLogVerbose(SCEKERNEL, SCE_KERNEL_ERROR_NOT_DORMANT, "not dormant");
 }
 
 int sceKernelGetThreadExitStatus(SceUID threadID) {
diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp
index 939bc0252f..36d72ef0af 100644
--- a/GPU/Common/TextureCacheCommon.cpp
+++ b/GPU/Common/TextureCacheCommon.cpp
@@ -367,7 +367,7 @@ TexCacheEntry *TextureCacheCommon::SetTexture() {
 	int bufw = GetTextureBufw(0, texaddr, format);
 	u8 maxLevel = gstate.getTextureMaxLevel();
 
-	u32 texhash = MiniHash((const u32 *)Memory::GetPointerUnchecked(texaddr));
+	u32 minihash = MiniHash((const u32 *)Memory::GetPointerUnchecked(texaddr));
 
 	TexCache::iterator entryIter = cache_.find(cachekey);
 	TexCacheEntry *entry = nullptr;
@@ -437,7 +437,7 @@ TexCacheEntry *TextureCacheCommon::SetTexture() {
 				rehash = true;
 			}
 
-			if (texhash != entry->hash) {
+			if (minihash != entry->minihash) {
 				match = false;
 				reason = "minihash";
 			} else if (entry->GetHashStatus() == TexCacheEntry::STATUS_RELIABLE) {
@@ -548,7 +548,7 @@ TexCacheEntry *TextureCacheCommon::SetTexture() {
 
 	// We have to decode it, let's setup the cache entry first.
 	entry->addr = texaddr;
-	entry->hash = texhash;
+	entry->minihash = minihash;
 	entry->dim = dim;
 	entry->format = format;
 	entry->maxLevel = maxLevel;
@@ -1822,7 +1822,7 @@ void TextureCacheCommon::Invalidate(u32 addr, int size, GPUInvalidationType type
 			if (type == GPU_INVALIDATE_FORCE) {
 				// Just random values to force the hash not to match.
 				entry->fullhash = (entry->fullhash ^ 0x12345678) + 13;
-				entry->hash = (entry->hash ^ 0x89ABCDEF) + 89;
+				entry->minihash = (entry->minihash ^ 0x89ABCDEF) + 89;
 			}
 			if (type != GPU_INVALIDATE_ALL) {
 				gpuStats.numTextureInvalidations++;
diff --git a/GPU/Common/TextureCacheCommon.h b/GPU/Common/TextureCacheCommon.h
index 9b16ade566..e6a3c0b58f 100644
--- a/GPU/Common/TextureCacheCommon.h
+++ b/GPU/Common/TextureCacheCommon.h
@@ -139,7 +139,7 @@ struct TexCacheEntry {
 	int status;
 
 	u32 addr;
-	u32 hash;
+	u32 minihash;
 	u32 sizeInRAM;  // Could be computed
 	u8 format;  // GeTextureFormat
 	u8 maxLevel;