scl/strato
1
0
Fork 0
mirror of https://github.com/Takiiiiiiii/strato.git synced 2025-07-17 08:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework TextureView to be disconnected from Texture

Browse Source 
We want `TextureView`(s) to be disconnected from the backing on the host and instead represent a specific texture on the guest with a backing that can change depending on mapping of new textures which'd invalidate the backing but should now be automatically repointed to an appropriate new backing. This approach also requires locking of the backing to function as it is mutable till it has been locked or the backing has an attached `FenceCycle` that hasn't been signaled which will be added for `CommandExecutor` in a subsequent commit.
This commit is contained in:
PixelyIon
2021-12-07 02:43:14 +05:30
parent 82916657fb
commit 6eda1777c5
10 changed files with 125 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,20 +6,22 @@
namespace skyline::gpu {
TextureManager::TextureManager(GPU &gpu) : gpu(gpu) {}
TextureView TextureManager::FindOrCreate(const GuestTexture &guestTexture) {
std::shared_ptr<TextureView> TextureManager::FindOrCreate(const GuestTexture &guestTexture) {
auto guestMapping{guestTexture.mappings.front()};
// Iterate over all textures that overlap with the first mapping of the guest texture and compare the mappings:
// 1) All mappings match up perfectly, we check that the rest of the supplied mappings correspond to mappings in the texture
// 1.1) If they match as well, we check for format/dimensions/tiling config matching the texture and return or move onto (3)
// 2) Only a contiguous range of mappings match, we check for if the overlap is meaningful with layout math, it can go two ways:
// 2.1) If there is a meaningful overlap, we check for format/dimensions/tiling config compatibility and return or move onto (3)
// 2.2) If there isn't, we move onto (3)
// 3) If there's another overlap we go back to (1) with it else we go to (4)
// 4) We check all the overlapping texture for if they're in the texture pool:
// 4.1) If they are, we do nothing to them
// 4.2) If they aren't, we delete them from the map
// 5) Create a new texture and insert it in the map then return it
/*
* Iterate over all textures that overlap with the first mapping of the guest texture and compare the mappings:
* 1) All mappings match up perfectly, we check that the rest of the supplied mappings correspond to mappings in the texture
* 1.1) If they match as well, we check for format/dimensions/tiling config matching the texture and return or move onto (3)
* 2) Only a contiguous range of mappings match, we check for if the overlap is meaningful with layout math, it can go two ways:
* 2.1) If there is a meaningful overlap, we check for format/dimensions/tiling config compatibility and return or move onto (3)
* 2.2) If there isn't, we move onto (3)
* 3) If there's another overlap we go back to (1) with it else we go to (4)
* 4) We check all the overlapping texture for if they're in the texture pool:
* 4.1) If they are, we do nothing to them
* 4.2) If they aren't, we delete them from the map
* 5) Create a new texture and insert it in the map then return it
*/
std::scoped_lock lock(mutex);
std::shared_ptr<Texture> match{};
@ -45,7 +47,7 @@ namespace skyline::gpu {
auto &matchGuestTexture{*hostMapping->texture->guest};
if (matchGuestTexture.format->IsCompatible(*guestTexture.format) && matchGuestTexture.dimensions == guestTexture.dimensions && matchGuestTexture.tileConfig == guestTexture.tileConfig) {
auto &texture{hostMapping->texture};
return TextureView(texture, static_cast<vk::ImageViewType>(guestTexture.type), vk::ImageSubresourceRange{
return texture->GetView(static_cast<vk::ImageViewType>(guestTexture.type), vk::ImageSubresourceRange{
.aspectMask = guestTexture.format->vkAspect,
.levelCount = texture->mipLevels,
.layerCount = texture->layerCount,
@ -76,7 +78,7 @@ namespace skyline::gpu {
textures.emplace(mapping, TextureMapping{texture, it, guestMapping});
}
return TextureView(texture, static_cast<vk::ImageViewType>(guestTexture.type), vk::ImageSubresourceRange{
return texture->GetView(static_cast<vk::ImageViewType>(guestTexture.type), vk::ImageSubresourceRange{
.aspectMask = guestTexture.format->vkAspect,
.levelCount = texture->mipLevels,
.layerCount = texture->layerCount,