Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-20 07:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PostProcessing: Fix assertion on some shader/texture formats

Browse source
This commit is contained in:
Stenzek 2023-12-28 15:30:56 +10:00
parent 63bc3883ea
commit 958b033a66
No known key found for this signature in database
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/memory_card.cpp
View file

@ -284,9 +284,10 @@ std::unique_ptr<MemoryCard> MemoryCard::Open(std::string_view filename)
mc->m_filename = filename; mc->m_filename = filename;
if (!mc->LoadFromFile()) if (!mc->LoadFromFile())
{ {
Log_InfoPrintf("Memory card at '%s' could not be read, formatting.", mc->m_filename.c_str()); Log_InfoFmt("Memory card at '{}' could not be read, formatting.", mc->m_filename);
Host::AddFormattedOSDMessage(5.0f, TRANSLATE("OSDMessage", "Memory card at '%s' could not be read, formatting."), Host::AddIconOSDMessage(fmt::format("memory_card_{}", filename), ICON_FA_SD_CARD,
mc->m_filename.c_str()); fmt::format(TRANSLATE_FS("OSDMessage", "Memory card '{}' could not be read, formatting."),
Path::GetFileName(filename), Host::OSD_INFO_DURATION));
mc->Format(); mc->Format();
} }

6
src/core/system.cpp
View file

@ -4698,8 +4698,10 @@ void System::ToggleSoftwareRendering()
const GPURenderer new_renderer = g_gpu->IsHardwareRenderer() ? GPURenderer::Software : g_settings.gpu_renderer; const GPURenderer new_renderer = g_gpu->IsHardwareRenderer() ? GPURenderer::Software : g_settings.gpu_renderer;
Host::AddKeyedFormattedOSDMessage("SoftwareRendering", 5.0f, TRANSLATE("OSDMessage", "Switching to %s renderer..."), Host::AddIconOSDMessage("SoftwareRendering", ICON_FA_PAINT_ROLLER,
Settings::GetRendererDisplayName(new_renderer)); fmt::format(TRANSLATE_FS("OSDMessage", "Switching to {} renderer..."),
Settings::GetRendererDisplayName(new_renderer)),
Host::OSD_QUICK_DURATION);
RecreateGPU(new_renderer); RecreateGPU(new_renderer);
ResetPerformanceCounters(); ResetPerformanceCounters();
} }

2
src/util/gpu_texture.cpp
View file

@ -33,6 +33,8 @@ const char* GPUTexture::GetFormatName(Format format)
"R8", // R8 "R8", // R8
"D16", // D16 "D16", // D16
"R16", // R16 "R16", // R16
"R16I", // R16I
"R16U", // R16U
"R16F", // R16F "R16F", // R16F
"R32I", // R32I "R32I", // R32I
"R32U", // R32U "R32U", // R32U