preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-20 17:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Texture/framebuffer matching: Do margin check in bytes.

Browse Source
This commit is contained in:
Henrik Rydgård committed 2022-09-11 16:18:04 +02:00
1 parent 694dbe1271
commit 4491c480a6
2 files changed
+24 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/Common/FramebufferManagerCommon.h
+1
View File
@@ -148,6 +148,7 @@ struct VirtualFramebuffer {
// Convenience methods
inline int WidthInBytes() const { return width * BufferFormatBytesPerPixel(fb_format); }
inline int BufferWidthInBytes() const { return bufferWidth * BufferFormatBytesPerPixel(fb_format); }
inline int FbStrideInBytes() const { return fb_stride * BufferFormatBytesPerPixel(fb_format); }
inline int ZStrideInBytes() const { return z_stride * 2; }
};
GPU/Common/TextureCacheCommon.cpp
+23 -18
View File
@@ -915,10 +915,11 @@ bool TextureCacheCommon::MatchFramebuffer(
const bool noOffset = texaddr == addr;
const bool exactMatch = noOffset && entry.format < 4 && channel == RASTER_COLOR && fb_stride_in_bytes == tex_stride_in_bytes;
const u32 w = 1 << ((entry.dim >> 0) & 0xf);
const u32 h = 1 << ((entry.dim >> 8) & 0xf);
const u32 texWidth = 1 << ((entry.dim >> 0) & 0xf);
const u32 texHeight = 1 << ((entry.dim >> 8) & 0xf);
// 512 on a 272 framebuffer is sane, so let's be lenient.
const u32 minSubareaHeight = h / 4;
const u32 minSubareaHeight = texHeight / 4;
// If they match "exactly", it's non-CLUT and from the top left.
if (exactMatch) {
@@ -948,19 +949,20 @@ bool TextureCacheCommon::MatchFramebuffer(
(fb_format == GE_FORMAT_8888 && entry.format == GE_TFMT_CLUT32) ||
(fb_format != GE_FORMAT_8888 && entry.format == GE_TFMT_CLUT16);
const int bitOffset = (texaddr - addr) * 8;
if (bitOffset != 0) {
const int pixelOffset = bitOffset / (int)std::max(1U, (u32)textureBitsPerPixel[entry.format]);
const int texBitsPerPixel = std::max(1U, (u32)textureBitsPerPixel[entry.format]);
const int byteOffset = texaddr - addr;
if (byteOffset != 0) {
const int texelOffset = byteOffset * 8 / texBitsPerPixel;
if (pixelOffset > 0) {
matchInfo->yOffset = entry.bufw == 0 ? 0 : pixelOffset / (int)entry.bufw;
matchInfo->xOffset = entry.bufw == 0 ? 0 : pixelOffset % (int)entry.bufw;
} else if (pixelOffset < 0) {
if (texelOffset > 0) {
matchInfo->yOffset = entry.bufw == 0 ? 0 : texelOffset / (int)entry.bufw;
matchInfo->xOffset = entry.bufw == 0 ? 0 : texelOffset % (int)entry.bufw;
} else if (texelOffset < 0) {
// We don't support negative Y offsets, and negative X offsets are only for the Killzone workaround.
if (pixelOffset < -(int)entry.bufw || !PSP_CoreParameter().compat.flags().SplitFramebufferMargin) {
if (texelOffset < -(int)entry.bufw || !PSP_CoreParameter().compat.flags().SplitFramebufferMargin) {
return false;
}
matchInfo->xOffset = entry.bufw == 0 ? 0 : -(-pixelOffset % (int)entry.bufw);
matchInfo->xOffset = entry.bufw == 0 ? 0 : -(-texelOffset % (int)entry.bufw);
}
}
@@ -969,13 +971,11 @@ bool TextureCacheCommon::MatchFramebuffer(
return false;
}
if (fb_stride_in_bytes != tex_stride_in_bytes) {
// Probably irrelevant.
return false;
}
// Check if it's in bufferWidth (which might be higher than width and may indicate the framebuffer includes the data.)
if (matchInfo->xOffset >= framebuffer->bufferWidth && matchInfo->xOffset + w <= (u32)fb_stride) {
// Do the computation in bytes so that it's valid even in case of weird reinterpret scenarios.
const int xOffsetInBytes = matchInfo->xOffset * 8 / texBitsPerPixel;
const int texWidthInBytes = texWidth * 8 / texBitsPerPixel;
if (xOffsetInBytes >= framebuffer->BufferWidthInBytes() && xOffsetInBytes + texWidthInBytes <= (int)fb_stride_in_bytes) {
// This happens in Brave Story, see #10045 - the texture is in the space between strides, with matching stride.
return false;
}
@@ -987,6 +987,11 @@ bool TextureCacheCommon::MatchFramebuffer(
return false;
}
if (fb_stride_in_bytes != tex_stride_in_bytes) {
// Probably irrelevant. Although, as we shall see soon, there are exceptions.
return false;
}
// Check for CLUT. The framebuffer is always RGB, but it can be interpreted as a CLUT texture.
// 3rd Birthday (and a bunch of other games) render to a 16 bit clut texture.
if (matchingClutFormat) {