Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

TexCache: Always apply detach matches if found.

Browse source 
The "Invalid" matches will only apply if nothing was attached, so it's
important that detaches happen.
This commit is contained in:
Unknown W. Brackets 2020-09-06 22:53:27 -07:00
parent 901239c05e
commit 85fb9a61e8
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
GPU/Common/TextureCacheCommon.cpp
View file

@ -561,34 +561,35 @@ void TextureCacheCommon::SetTexture(bool force) {
bool TextureCacheCommon::AttachFramebufferToEntry(TexCacheEntry *entry, u32 texAddrOffset) {
bool success = false;
bool anyIgnores = false;
std::vector<AttachCandidate> candidates;
bool anyIgnores = false;
std::vector<AttachCandidate> detaches;
FramebufferNotificationChannel channel = (entry->status & TexCacheEntry::STATUS_DEPTH) ? NOTIFY_FB_DEPTH : NOTIFY_FB_COLOR;
for (size_t i = 0, n = fbCache_.size(); i < n; ++i) {
auto framebuffer = fbCache_[i];
uint32_t fb_addr = channel == NOTIFY_FB_DEPTH ? framebuffer->z_address : framebuffer->fb_address;
FramebufferMatchInfo match = MatchFramebuffer(entry, fb_addr, framebuffer, texAddrOffset, channel);
if (match.match != FramebufferMatch::IGNORE && match.match != FramebufferMatch::NO_MATCH) {
candidates.push_back(AttachCandidate{ match, entry, framebuffer, channel });
} else if (match.match == FramebufferMatch::IGNORE) {
if (match.match == FramebufferMatch::IGNORE) {
anyIgnores = true;
} else if (match.match == FramebufferMatch::NO_MATCH) {
detaches.push_back(AttachCandidate{ match, entry, framebuffer, channel });
} else {
candidates.push_back(AttachCandidate{ match, entry, framebuffer, channel });
}
}
// If this is set, we want to defer the decision, apparently.
if (!anyIgnores) {
// If not set, always detach. They may affect inexact matches.
for (AttachCandidate &candidate : detaches) {
DetachFramebuffer(entry, entry->addr, entry->framebuffer, channel);
}
}
if (!candidates.size()) {
// No candidates at all.
if (anyIgnores) {
// We want to defer the decision, apparently.
return false;
}
// Actively detach the current framebuffer.
if (entry->framebuffer) {
DetachFramebuffer(entry, entry->addr, entry->framebuffer, channel);
}
return false;
}