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 non-internal resolution screenshots

Browse source
This commit is contained in:
Stenzek 2023-09-02 19:29:58 +10:00
parent 9e8ff3969e
commit bcda86d782
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/gpu.cpp
View file

@ -2069,10 +2069,13 @@ bool GPU::RenderScreenshotToFile(std::string filename, bool internal_resolution
{ {
u32 width = g_gpu_device->GetWindowWidth(); u32 width = g_gpu_device->GetWindowWidth();
u32 height = g_gpu_device->GetWindowHeight(); u32 height = g_gpu_device->GetWindowHeight();
auto [draw_left, draw_top, draw_width, draw_height] = CalculateDrawRect(width, height); Common::Rectangle<s32> draw_rect = CalculateDrawRect(width, height);
if (internal_resolution && m_display_texture_view_width != 0 && m_display_texture_view_height != 0) if (internal_resolution && m_display_texture_view_width != 0 && m_display_texture_view_height != 0)
{ {
const u32 draw_width = static_cast<u32>(draw_rect.GetWidth());
const u32 draw_height = static_cast<u32>(draw_rect.GetHeight());
// If internal res, scale the computed draw rectangle to the internal res. // If internal res, scale the computed draw rectangle to the internal res.
// We re-use the draw rect because it's already been AR corrected. // We re-use the draw rect because it's already been AR corrected.
const float sar = const float sar =
@ -2109,10 +2112,7 @@ bool GPU::RenderScreenshotToFile(std::string filename, bool internal_resolution
} }
// Remove padding, it's not part of the framebuffer. // Remove padding, it's not part of the framebuffer.
draw_left = 0; draw_rect.Set(0, 0, static_cast<s32>(width), static_cast<s32>(height));
draw_top = 0;
draw_width = static_cast<s32>(width);
draw_height = static_cast<s32>(height);
} }
if (width == 0 || height == 0) if (width == 0 || height == 0)
return false; return false;
@ -2120,9 +2120,8 @@ bool GPU::RenderScreenshotToFile(std::string filename, bool internal_resolution
std::vector<u32> pixels; std::vector<u32> pixels;
u32 pixels_stride; u32 pixels_stride;
GPUTexture::Format pixels_format; GPUTexture::Format pixels_format;
if (!RenderScreenshotToBuffer(width, height, if (!RenderScreenshotToBuffer(width, height, draw_rect, !internal_resolution, &pixels, &pixels_stride,
Common::Rectangle<s32>::FromExtents(draw_left, draw_top, draw_width, draw_height), &pixels_format))
!internal_resolution, &pixels, &pixels_stride, &pixels_format))
{ {
Log_ErrorPrintf("Failed to render %ux%u screenshot", width, height); Log_ErrorPrintf("Failed to render %ux%u screenshot", width, height);
return false; return false;