mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-02 13:20:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

D3D: Skip redundant format convertions.

Browse Source
This commit is contained in:
degasus 2016-10-08 14:46:44 +02:00
parent b5a91e1dfa
commit 1ef5ba0c53
2 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/VideoBackends/D3D/Render.cpp
View File

@ -745,22 +745,6 @@ bool Renderer::SaveScreenshot(const std::string& filename, const TargetRectangle
return saved_png; return saved_png;
} }
void formatBufferDump(const u8* in, u8* out, int w, int h, int p)
{
for (int y = 0; y < h; ++y)
{
auto line = (in + (h - y - 1) * p);
for (int x = 0; x < w; ++x)
{
out[0] = line[2];
out[1] = line[1];
out[2] = line[0];
out += 3;
line += 4;
}
}
}
// This function has the final picture. We adjust the aspect ratio here. // This function has the final picture. We adjust the aspect ratio here.
void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight,
const EFBRectangle& rc, float Gamma) const EFBRectangle& rc, float Gamma)
@ -886,11 +870,8 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight,
D3D11_MAPPED_SUBRESOURCE map; D3D11_MAPPED_SUBRESOURCE map;
D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map); D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map);
// TODO: This convertion is not needed. Get rid of it. DumpFrameData(reinterpret_cast<const u8*>(map.pData), source_width, source_height,
std::vector<u8> image(source_width * source_height * 3); AVIDump::DumpFormat::FORMAT_RGBA);
formatBufferDump((u8*)map.pData, image.data(), source_width, source_height, map.RowPitch);
DumpFrameData(image.data(), source_width, source_height, AVIDump::DumpFormat::FORMAT_BGR, true);
FinishFrameData(); FinishFrameData();
D3D::context->Unmap(s_screenshot_texture, 0); D3D::context->Unmap(s_screenshot_texture, 0);

24
Source/Core/VideoBackends/D3D12/Render.cpp
View File

@ -688,22 +688,6 @@ bool Renderer::SaveScreenshot(const std::string& filename, const TargetRectangle
return saved_png; return saved_png;
} }
void formatBufferDump(const u8* in, u8* out, int w, int h, int p)
{
for (int y = 0; y < h; ++y)
{
auto line = (in + (h - y - 1) * p);
for (int x = 0; x < w; ++x)
{
out[0] = line[2];
out[1] = line[1];
out[2] = line[0];
out += 3;
line += 4;
}
}
}
// This function has the final picture. We adjust the aspect ratio here. // This function has the final picture. We adjust the aspect ratio here.
void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height, void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height,
const EFBRectangle& rc, float gamma) const EFBRectangle& rc, float gamma)
@ -863,12 +847,8 @@ void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height
D3D12_RANGE read_range = {0, dst_location.PlacedFootprint.Footprint.RowPitch * source_height}; D3D12_RANGE read_range = {0, dst_location.PlacedFootprint.Footprint.RowPitch * source_height};
CheckHR(s_screenshot_texture->Map(0, &read_range, &screenshot_texture_map)); CheckHR(s_screenshot_texture->Map(0, &read_range, &screenshot_texture_map));
// TODO: This convertion is not needed. Get rid of it. DumpFrameData(reinterpret_cast<const u8*>(screenshot_texture_map), source_width, source_height,
std::vector<u8> image(source_width * source_height * 3); AVIDump::DumpFormat::FORMAT_RGBA);
formatBufferDump(static_cast<u8*>(screenshot_texture_map), image.data(), source_width,
source_height, dst_location.PlacedFootprint.Footprint.RowPitch);
DumpFrameData(image.data(), source_width, source_height, AVIDump::DumpFormat::FORMAT_BGR, true);
FinishFrameData(); FinishFrameData();
D3D12_RANGE write_range = {}; D3D12_RANGE write_range = {};