drashna/ryujinx
1
0
Fork 0
Code Activity Actions

Avoid deleting textures when their data does not overlap. (#2601)

Browse source 
* Avoid deleting textures when their data does not overlap.

It's possible that while two textures start and end addresses indicate an overlap, that the actual data contained within them is sparse due to a layer stride. One such possibility is array slices of a cubemap at different mip levels - they overlap on a whole, but the actual texture data fills the gaps between each other's layers rather than actually overlapping.

This fixes issues with UE4 games having incorrect lighting (solid white screen or really dark shadows). There are still remaining issues with games that use the 3D texture prebaked lighting, such as THPS1+2.

This PR also fixes a bug with TexturePool's resized texture handling where the base level in the descriptor was not considered.

* AllRegions granularity for 3d textures is now by level rather than by slice.

* Address feedback
This commit is contained in:
riperiperi 2021-08-29 20:22:13 +01:00 • committed by GitHub
parent 54adc5f9fb
commit 15e7fe3ac9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 75 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ryujinx.Graphics.Gpu/Image/TextureCache.cs
View file

@ -636,6 +636,13 @@ namespace Ryujinx.Graphics.Gpu.Image
continue;
}
if (!texture.DataOverlaps(overlap))
{
// Allow textures to overlap if their data does not actually overlap.
// This typically happens when mip level subranges of a layered texture are used. (each texture fills the gaps of the others)
continue;
}
// The overlap texture is going to contain garbage data after we draw, or is generally incompatible.
// If the texture cannot be entirely contained in the new address space, and one of its view children is compatible with us,
// it must be flushed before removal, so that the data is not lost.