GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-29 14:05:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Synchronize all non-matching textures back to host before recreation

Browse Source
This commit is contained in:
Billy Laws 2022-10-09 16:34:49 +01:00
parent 05581f2230
commit 500f817a28
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/cpp/skyline/gpu/texture_manager.cpp
View File

@ -24,6 +24,7 @@ namespace skyline::gpu {
*/ */
std::shared_ptr<Texture> match{}; std::shared_ptr<Texture> match{};
boost::container::small_vector<std::shared_ptr<Texture>, 4> matches{};
auto mappingEnd{std::upper_bound(textures.begin(), textures.end(), guestMapping)}, hostMapping{mappingEnd}; auto mappingEnd{std::upper_bound(textures.begin(), textures.end(), guestMapping)}, hostMapping{mappingEnd};
while (hostMapping != textures.begin() && (--hostMapping)->end() > guestMapping.begin()) { while (hostMapping != textures.begin() && (--hostMapping)->end() > guestMapping.begin()) {
auto &hostMappings{hostMapping->texture->guest->mappings}; auto &hostMappings{hostMapping->texture->guest->mappings};
@ -58,6 +59,8 @@ namespace skyline::gpu {
.levelCount = guestTexture.viewMipCount, .levelCount = guestTexture.viewMipCount,
.layerCount = guestTexture.GetViewLayerCount(), .layerCount = guestTexture.GetViewLayerCount(),
}, guestTexture.format, guestTexture.swizzle); }, guestTexture.format, guestTexture.swizzle);
} else {
matches.push_back(hostMapping->texture);
} }
} /* else if (mappingMatch) { } /* else if (mappingMatch) {
// We've gotten a partial match with a certain subset of contiguous mappings matching, we need to check if this is a meaningful overlap // We've gotten a partial match with a certain subset of contiguous mappings matching, we need to check if this is a meaningful overlap
@ -73,6 +76,9 @@ namespace skyline::gpu {
} */ } */
} }
for (auto &texture : matches)
texture->SynchronizeGuest(false, true);
// Create a texture as we cannot find one that matches // Create a texture as we cannot find one that matches
auto texture{std::make_shared<Texture>(gpu, guestTexture)}; auto texture{std::make_shared<Texture>(gpu, guestTexture)};
texture->SetupGuestMappings(); texture->SetupGuestMappings();