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

Rename TextureView::backing to TextureView::texture

Browse Source 
It was determined that `backing` wasn't a very descriptive name and that it conflicted with the texture's own backing, the name was changed to `texture` to make it more apparent that it was specifically the `Texture` object backing the view.
This commit is contained in:
PixelyIon
2021-12-02 02:12:37 +05:30
parent 482c573b81
commit a55aca76c6
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/cpp/skyline/gpu/texture/texture.cpp
View File

@ -455,14 +455,14 @@ namespace skyline::gpu {
WaitOnFence();
}
TextureView::TextureView(std::shared_ptr<Texture> backing, vk::ImageViewType type, vk::ImageSubresourceRange range, texture::Format format, vk::ComponentMapping mapping) : backing(std::move(backing)), type(type), format(format), mapping(mapping), range(range) {}
TextureView::TextureView(std::shared_ptr<Texture> texture, vk::ImageViewType type, vk::ImageSubresourceRange range, texture::Format format, vk::ComponentMapping mapping) : texture(std::move(texture)), type(type), format(format), mapping(mapping), range(range) {}
vk::ImageView TextureView::GetView() {
if (view)
return **view;
auto viewType{[&]() {
switch (backing->dimensions.GetType()) {
switch (texture->dimensions.GetType()) {
case vk::ImageType::e1D:
return range.layerCount > 1 ? vk::ImageViewType::e1DArray : vk::ImageViewType::e1D;
case vk::ImageType::e2D:
@ -473,20 +473,20 @@ namespace skyline::gpu {
}()};
vk::ImageViewCreateInfo createInfo{
.image = backing->GetBacking(),
.image = texture->GetBacking(),
.viewType = viewType,
.format = format ? *format : *backing->format,
.format = format ? *format : *texture->format,
.components = mapping,
.subresourceRange = range,
};
auto &views{backing->views};
auto &views{texture->views};
auto iterator{std::find_if(views.begin(), views.end(), [&](const std::pair<vk::ImageViewCreateInfo, vk::raii::ImageView> &item) {
return item.first == createInfo;
})};
if (iterator != views.end())
return *iterator->second;
return *views.emplace_back(createInfo, vk::raii::ImageView(backing->gpu.vkDevice, createInfo)).second;
return *views.emplace_back(createInfo, vk::raii::ImageView(texture->gpu.vkDevice, createInfo)).second;
}
}