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

Don't throw on unsupported TIC formats

Browse Source 
These sometimes spuriously occur in games during transitions, to avoid crashing during them just use the null texture if they occur and log an error log
This commit is contained in:
Billy Laws 2022-07-31 14:20:37 +01:00
parent 856818c8eb
commit 9ea658d0ed
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/cpp/skyline/gpu/interconnect/graphics_context.h
View File

@ -2200,7 +2200,8 @@ namespace skyline::gpu::interconnect {
TIC_FORMAT_CASE_INT_FLOAT(R32G32B32A32, R32G32B32A32);
default:
throw exception("Cannot translate TIC format: 0x{:X}", static_cast<u32>(format.Raw()));
Logger::Error("Cannot translate TIC format: 0x{:X}", static_cast<u32>(format.Raw()));
return {};
}
#undef TIC_FORMAT
@ -2258,14 +2259,15 @@ namespace skyline::gpu::interconnect {
auto textureIt{texturePool.textures.insert({textureControl, {}})};
auto &poolTexture{textureIt.first->second};
if (textureIt.second) {
if (textureControl.formatWord.format == TextureImageControl::ImageFormat::Invalid) {
// If the entry didn't exist prior then we need to convert the TIC to a GuestTexture
auto &guest{poolTexture.guest};
if (auto format{ConvertTicFormat(textureControl.formatWord, textureControl.isSrgb)}) {
guest.format = format;
} else {
poolTexture.view = nullTextureView;
return nullTextureView;
}
// If the entry didn't exist prior then we need to convert the TIC to a GuestTexture
auto &guest{poolTexture.guest};
guest.format = ConvertTicFormat(textureControl.formatWord, textureControl.isSrgb);
guest.aspect = guest.format->Aspect(textureControl.formatWord.swizzleX == TextureImageControl::ImageSwizzle::R);
guest.swizzle = ConvertTicSwizzleMapping(textureControl.formatWord, guest.format->swizzleMapping);