The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-06 03:35:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust texture matching hacks

Browse Source
This commit is contained in:
Billy Laws 2022-10-30 16:24:43 +00:00
parent 4f5c9047ef
commit 2dd4698441
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -857,6 +857,11 @@ namespace skyline::gpu {
if (gpu.traits.quirks.vkImageMutableFormatCostly && viewFormat != textureFormat && (!gpu.traits.quirks.adrenoRelaxedFormatAliasing || !texture::IsAdrenoAliasCompatible(viewFormat, textureFormat))) if (gpu.traits.quirks.vkImageMutableFormatCostly && viewFormat != textureFormat && (!gpu.traits.quirks.adrenoRelaxedFormatAliasing || !texture::IsAdrenoAliasCompatible(viewFormat, textureFormat)))
Logger::Warn("Creating a view of a texture with a different format without mutable format: {} - {}", vk::to_string(viewFormat), vk::to_string(textureFormat)); Logger::Warn("Creating a view of a texture with a different format without mutable format: {} - {}", vk::to_string(viewFormat), vk::to_string(textureFormat));
if ((pFormat->vkAspect & format->vkAspect) == vk::ImageAspectFlagBits{}) {
pFormat = format; // If the requested format doesn't share any aspects then fallback to the texture's format in the hope it's more likely to function
range.aspectMask = format->Aspect(mapping.r == vk::ComponentSwizzle::eR);
}
return std::make_shared<TextureView>(shared_from_this(), type, range, pFormat, mapping); return std::make_shared<TextureView>(shared_from_this(), type, range, pFormat, mapping);
} }

1
app/src/main/cpp/skyline/gpu/texture/texture.h
View File

@ -115,7 +115,6 @@ namespace skyline::gpu {
constexpr bool IsCompatible(const FormatBase &other) const { constexpr bool IsCompatible(const FormatBase &other) const {
return vkFormat == other.vkFormat return vkFormat == other.vkFormat
|| (vkFormat == vk::Format::eD32Sfloat && other.vkFormat == vk::Format::eR32Sfloat) || (vkFormat == vk::Format::eD32Sfloat && other.vkFormat == vk::Format::eR32Sfloat)
|| (vkFormat == vk::Format::eR32Sfloat && other.vkFormat == vk::Format::eD32Sfloat)
|| (componentCount(vkFormat) == componentCount(other.vkFormat) && || (componentCount(vkFormat) == componentCount(other.vkFormat) &&
ranges::all_of(ranges::views::iota(u8{0}, componentCount(vkFormat)), [this, other](auto i) { ranges::all_of(ranges::views::iota(u8{0}, componentCount(vkFormat)), [this, other](auto i) {
return componentBits(vkFormat, i) == componentBits(other.vkFormat, i); return componentBits(vkFormat, i) == componentBits(other.vkFormat, i);