Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Replacer: Avoid tracking video textures

Browse Source
This commit is contained in:
Henrik Rydgård 2023-03-10 12:20:55 +01:00
parent 5d34d9112e
commit 06b83115a5
7 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common/GPU/Vulkan/VulkanDebug.cpp
View File

@ -62,6 +62,12 @@ VKAPI_ATTR VkBool32 VKAPI_CALL VulkanDebugUtilsCallback(
// See https://github.com/hrydgard/ppsspp/pull/16354
return false;
}
if (messageCode == -375211665) {
// VUID-vkAllocateMemory-pAllocateInfo-01713
// Can happen when VMA aggressively tries to allocate aperture memory for upload. It gracefully
// falls back to regular video memory, so we just ignore this. I'd argue this is a VMA bug, actually.
return false;
}
int count;
{

2
GPU/Common/ReplacedTexture.h
View File

@ -59,6 +59,8 @@ struct ReplacedTextureLevel {
ReplacedImageType Identify(VFSBackend *vfs, VFSOpenFile *openFile, std::string *outMagic);
// These aren't actually all replaced, they can also represent a placeholder for a not-found
// replacement.
struct ReplacedTexture {
~ReplacedTexture();

11
GPU/Common/TextureCacheCommon.cpp
View File

@ -144,6 +144,11 @@ void TextureCacheCommon::StartFrame() {
timesInvalidatedAllThisFrame_ = 0;
replacementTimeThisFrame_ = 0.0;
if (g_Config.bShowDebugStats) {
gpuStats.numReplacerTrackedTex = replacer_.GetNumTrackedTextures();
gpuStats.numCachedReplacedTextures = replacer_.GetNumCachedReplacedTextures();
}
if (texelsScaledThisFrame_) {
VERBOSE_LOG(G3D, "Scaled %d texels", texelsScaledThisFrame_);
}
@ -1497,6 +1502,10 @@ ReplacedTexture *TextureCacheCommon::FindReplacement(TexCacheEntry *entry, int &
return nullptr;
}
if (entry->status & TexCacheEntry::STATUS_VIDEO) {
return nullptr;
}
// Allow some delay to reduce pop-in.
constexpr double MAX_BUDGET_PER_TEX = 0.25 / 60.0;
@ -2039,7 +2048,7 @@ void TextureCacheCommon::ApplyTexture() {
// Regardless of hash fails or otherwise, if this is a video, mark it frequently changing.
// This prevents temporary scaling perf hits on the first second of video.
if (IsVideo(entry->addr)) {
entry->status |= TexCacheEntry::STATUS_CHANGE_FREQUENT;
entry->status |= TexCacheEntry::STATUS_CHANGE_FREQUENT | TexCacheEntry::STATUS_VIDEO;
}
if (nextNeedsRehash_) {

6
GPU/Common/TextureCacheCommon.h
View File

@ -149,10 +149,12 @@ struct TexCacheEntry {
STATUS_3D = 0x4000,
STATUS_CLUT_GPU = 0x8000,
STATUS_VIDEO = 0x10000,
};
// Status, but int so we can zero initialize.
int status;
// TexStatus enum flag combination.
u32 status;
u32 addr;
u32 minihash;

3
GPU/Common/TextureReplacer.h
View File

@ -127,6 +127,9 @@ public:
static bool GenerateIni(const std::string &gameID, Path &generatedFilename);
static bool IniExists(const std::string &gameID);
int GetNumTrackedTextures() const { return (int)cache_.size(); }
int GetNumCachedReplacedTextures() const { return (int)levelCache_.size(); }
protected:
bool LoadIni();
bool LoadIniValues(IniFile &ini, bool isOverride = false);

4
GPU/GPU.h
View File

@ -100,6 +100,8 @@ struct GPUStatistics {
numColorCopies = 0;
numCopiesForShaderBlend = 0;
numCopiesForSelfTex = 0;
numReplacerTrackedTex = 0;
numCachedReplacedTextures = 0;
msProcessingDisplayLists = 0;
vertexGPUCycles = 0;
otherGPUCycles = 0;
@ -133,6 +135,8 @@ struct GPUStatistics {
int numColorCopies;
int numCopiesForShaderBlend;
int numCopiesForSelfTex;
int numReplacerTrackedTex;
int numCachedReplacedTextures;
double msProcessingDisplayLists;
int vertexGPUCycles;
int otherGPUCycles;

3
GPU/GPUCommonHW.cpp
View File

@ -1636,6 +1636,7 @@ size_t GPUCommonHW::FormatGPUStatsCommon(char *buffer, size_t size) {
"FBOs active: %d (evaluations: %d)\n"
"Textures: %d, dec: %d, invalidated: %d, hashed: %d kB\n"
"readbacks %d (%d non-block), uploads %d, depal %d\n"
"replacer: tracks %d textures, %d unique loaded\n"
"Copies: depth %d, color %d, reint %d, blend %d, selftex %d\n"
"GPU cycles executed: %d (%f per vertex)\n",
gpuStats.msProcessingDisplayLists * 1000.0f,
@ -1659,6 +1660,8 @@ size_t GPUCommonHW::FormatGPUStatsCommon(char *buffer, size_t size) {
gpuStats.numReadbacks,
gpuStats.numUploads,
gpuStats.numDepal,
gpuStats.numReplacerTrackedTex,
gpuStats.numCachedReplacedTextures,
gpuStats.numDepthCopies,
gpuStats.numColorCopies,
gpuStats.numReinterpretCopies,