Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 13:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GPU: Fix crash with Box Downsampling/Auto Resolution Scale

Browse source
This commit is contained in:
Stenzek 2023-09-30 23:20:05 +10:00
parent 2171fd9a6f
commit d5608bf12d
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/gpu_hw.cpp
View file

@ -51,10 +51,10 @@ ALWAYS_INLINE static u32 GetMaxResolutionScale()
return g_gpu_device->GetMaxTextureSize() / VRAM_WIDTH; return g_gpu_device->GetMaxTextureSize() / VRAM_WIDTH;
} }
ALWAYS_INLINE_RELEASE static u32 GetBoxDownsampleScale() ALWAYS_INLINE_RELEASE static u32 GetBoxDownsampleScale(u32 resolution_scale)
{ {
u32 scale = std::min<u32>(g_settings.gpu_resolution_scale, g_settings.gpu_downsample_scale); u32 scale = std::min<u32>(resolution_scale, g_settings.gpu_downsample_scale);
while ((g_settings.gpu_resolution_scale % scale) != 0) while ((resolution_scale % scale) != 0)
scale--; scale--;
return scale; return scale;
} }
@ -472,15 +472,16 @@ void GPU_HW::CheckSettings()
if (m_downsample_mode == GPUDownsampleMode::Box) if (m_downsample_mode == GPUDownsampleMode::Box)
{ {
const u32 scale = GetBoxDownsampleScale(); const u32 resolution_scale = CalculateResolutionScale();
if (scale != g_settings.gpu_downsample_scale || scale == g_settings.gpu_resolution_scale) const u32 box_downscale = GetBoxDownsampleScale(resolution_scale);
if (box_downscale != g_settings.gpu_downsample_scale || box_downscale == resolution_scale)
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
"BoxDownsampleUnsupported", ICON_FA_PAINT_BRUSH, "BoxDownsampleUnsupported", ICON_FA_PAINT_BRUSH,
fmt::format( fmt::format(
TRANSLATE_FS("OSDMessage", TRANSLATE_FS("OSDMessage",
"Resolution scale {0}x is not divisible by downsample scale {1}x, using {2}x instead."), "Resolution scale {0}x is not divisible by downsample scale {1}x, using {2}x instead."),
g_settings.gpu_resolution_scale, g_settings.gpu_downsample_scale, scale), resolution_scale, g_settings.gpu_downsample_scale, box_downscale),
Host::OSD_ERROR_DURATION); Host::OSD_ERROR_DURATION);
} }
else else
@ -488,7 +489,7 @@ void GPU_HW::CheckSettings()
Host::RemoveKeyedOSDMessage("BoxDownsampleUnsupported"); Host::RemoveKeyedOSDMessage("BoxDownsampleUnsupported");
} }
if (scale == g_settings.gpu_resolution_scale) if (box_downscale == g_settings.gpu_resolution_scale)
m_downsample_mode = GPUDownsampleMode::Disabled; m_downsample_mode = GPUDownsampleMode::Disabled;
} }
@ -676,7 +677,7 @@ bool GPU_HW::CreateBuffers()
} }
else if (m_downsample_mode == GPUDownsampleMode::Box) else if (m_downsample_mode == GPUDownsampleMode::Box)
{ {
const u32 downsample_scale = GetBoxDownsampleScale(); const u32 downsample_scale = GetBoxDownsampleScale(m_resolution_scale);
if (!(m_downsample_render_texture = if (!(m_downsample_render_texture =
g_gpu_device->CreateTexture(VRAM_WIDTH * downsample_scale, VRAM_HEIGHT * downsample_scale, 1, 1, 1, g_gpu_device->CreateTexture(VRAM_WIDTH * downsample_scale, VRAM_HEIGHT * downsample_scale, 1, 1, 1,
GPUTexture::Type::RenderTarget, VRAM_RT_FORMAT)) || GPUTexture::Type::RenderTarget, VRAM_RT_FORMAT)) ||
@ -1152,8 +1153,8 @@ bool GPU_HW::CompilePipelines()
else if (m_downsample_mode == GPUDownsampleMode::Box) else if (m_downsample_mode == GPUDownsampleMode::Box)
{ {
std::unique_ptr<GPUShader> fs = g_gpu_device->CreateShader( std::unique_ptr<GPUShader> fs = g_gpu_device->CreateShader(
GPUShaderStage::Fragment, GPUShaderStage::Fragment, shadergen.GenerateBoxSampleDownsampleFragmentShader(
shadergen.GenerateBoxSampleDownsampleFragmentShader(m_resolution_scale / GetBoxDownsampleScale())); m_resolution_scale / GetBoxDownsampleScale(m_resolution_scale)));
if (!fs) if (!fs)
return false; return false;
@ -2777,7 +2778,7 @@ void GPU_HW::DownsampleFramebufferAdaptive(GPUTexture* source, u32 left, u32 top
void GPU_HW::DownsampleFramebufferBoxFilter(GPUTexture* source, u32 left, u32 top, u32 width, u32 height) void GPU_HW::DownsampleFramebufferBoxFilter(GPUTexture* source, u32 left, u32 top, u32 width, u32 height)
{ {
const u32 factor = m_resolution_scale / GetBoxDownsampleScale(); const u32 factor = m_resolution_scale / GetBoxDownsampleScale(m_resolution_scale);
const u32 ds_left = left / factor; const u32 ds_left = left / factor;
const u32 ds_top = top / factor; const u32 ds_top = top / factor;
const u32 ds_width = width / factor; const u32 ds_width = width / factor;