mirror of
https://github.com/yuzu-mirror/yuzu
synced 2024-12-19 12:43:05 +00:00
texture_cache: Try to Reconstruct Surface on bigger than overlap.
This fixes clouds in SMO Cap Kingdom and lens on Cloud Kingdom. Also moved accurate_gpu setting check to Pick Strategy
This commit is contained in:
parent
a79831d9d0
commit
4530511ee4
1 changed files with 11 additions and 4 deletions
|
@ -295,6 +295,9 @@ private:
|
||||||
|
|
||||||
RecycleStrategy PickStrategy(std::vector<TSurface>& overlaps, const SurfaceParams& params,
|
RecycleStrategy PickStrategy(std::vector<TSurface>& overlaps, const SurfaceParams& params,
|
||||||
const GPUVAddr gpu_addr, const bool untopological) {
|
const GPUVAddr gpu_addr, const bool untopological) {
|
||||||
|
if (Settings::values.use_accurate_gpu_emulation) {
|
||||||
|
return RecycleStrategy::Flush;
|
||||||
|
}
|
||||||
// 3D Textures decision
|
// 3D Textures decision
|
||||||
if (params.block_depth > 1 || params.target == SurfaceTarget::Texture3D) {
|
if (params.block_depth > 1 || params.target == SurfaceTarget::Texture3D) {
|
||||||
return RecycleStrategy::Flush;
|
return RecycleStrategy::Flush;
|
||||||
|
@ -319,10 +322,7 @@ private:
|
||||||
for (auto surface : overlaps) {
|
for (auto surface : overlaps) {
|
||||||
Unregister(surface);
|
Unregister(surface);
|
||||||
}
|
}
|
||||||
RecycleStrategy strategy = !Settings::values.use_accurate_gpu_emulation
|
switch (PickStrategy(overlaps, params, gpu_addr, untopological)) {
|
||||||
? PickStrategy(overlaps, params, gpu_addr, untopological)
|
|
||||||
: RecycleStrategy::Flush;
|
|
||||||
switch (strategy) {
|
|
||||||
case RecycleStrategy::Ignore: {
|
case RecycleStrategy::Ignore: {
|
||||||
return InitializeSurface(gpu_addr, params, preserve_contents);
|
return InitializeSurface(gpu_addr, params, preserve_contents);
|
||||||
}
|
}
|
||||||
|
@ -453,6 +453,13 @@ private:
|
||||||
if (overlaps.size() == 1) {
|
if (overlaps.size() == 1) {
|
||||||
TSurface current_surface = overlaps[0];
|
TSurface current_surface = overlaps[0];
|
||||||
if (!current_surface->IsInside(gpu_addr, gpu_addr + candidate_size)) {
|
if (!current_surface->IsInside(gpu_addr, gpu_addr + candidate_size)) {
|
||||||
|
if (current_surface->GetGpuAddr() == gpu_addr) {
|
||||||
|
std::optional<std::pair<TSurface, TView>> view =
|
||||||
|
ReconstructSurface(overlaps, params, gpu_addr, host_ptr);
|
||||||
|
if (view.has_value()) {
|
||||||
|
return *view;
|
||||||
|
}
|
||||||
|
}
|
||||||
return RecycleSurface(overlaps, params, gpu_addr, preserve_contents, false);
|
return RecycleSurface(overlaps, params, gpu_addr, preserve_contents, false);
|
||||||
}
|
}
|
||||||
std::optional<TView> view =
|
std::optional<TView> view =
|
||||||
|
|
Loading…
Reference in a new issue