From 0721405628dee69d131fe7dd9e93be1858abfcff Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 17 Oct 2021 12:46:02 -0700 Subject: [PATCH] Replacement: Avoid clash with X define. --- Core/TextureReplacer.h | 2 +- GPU/Common/TextureCacheCommon.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/TextureReplacer.h b/Core/TextureReplacer.h index a931b9e645..e94a3143cf 100644 --- a/Core/TextureReplacer.h +++ b/Core/TextureReplacer.h @@ -195,7 +195,7 @@ public: ReplacedTexture &FindReplacement(u64 cachekey, u32 hash, int w, int h); bool FindFiltering(u64 cachekey, u32 hash, TextureFiltering *forceFiltering); - ReplacedTexture &None() { + ReplacedTexture &FindNone() { return none_; } diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index 0a931c32b1..f40b015211 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -1285,7 +1285,7 @@ ReplacedTexture &TextureCacheCommon::FindReplacement(TexCacheEntry *entry, int & } else if (replaced.Valid()) { entry->status |= TexCacheEntry::STATUS_TO_REPLACE; } - return replacer_.None(); + return replacer_.FindNone(); } static void ReverseColors(void *dstBuf, const void *srcBuf, GETextureFormat fmt, int numPixels, bool useBGRA) {