mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-01 21:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Video Backends: Remove the right of the xfb region for games where the

Browse source 
VI stride does not match the VI width
This commit is contained in:
iwubcode 2017-09-29 00:31:08 -05:00
commit 4964fc87ae
10 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/VideoCommon/BPStructs.cpp
View file

@ -270,7 +270,8 @@ static void BPWritten(const BPCmd& bp)
if (g_ActiveConfig.bImmediateXFB)
{
// below div two to convert from bytes to pixels - it expects width, not stride
g_renderer->Swap(destAddr, destStride / 2, destStride / 2, height, false, srcRect, CoreTiming::GetTicks());
g_renderer->Swap(destAddr, destStride / 2, destStride / 2, height, srcRect,
CoreTiming::GetTicks());
}
else
{

16
Source/Core/VideoCommon/RenderBase.cpp
View file

@ -651,10 +651,14 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const
m_last_xfb_texture = xfb_entry->texture.get();
m_last_xfb_id = xfb_entry->id;
m_last_xfb_ticks = ticks;
m_last_xfb_horizontal_scale = horizontal_scale;
auto xfb_rect = xfb_entry->texture->GetConfig().GetRect();
xfb_rect.right -= EFBToScaledX(fbStride - fbWidth);
m_last_xfb_region = xfb_rect;
// TODO: merge more generic parts into VideoCommon
g_renderer->SwapImpl(xfb_entry->texture.get(), rc, ticks, xfb_entry->gamma);
g_renderer->SwapImpl(xfb_entry->texture.get(), xfb_rect, ticks, xfb_entry->gamma);
m_fps_counter.Update();
update_frame_count = true;
@ -693,7 +697,7 @@ bool Renderer::IsFrameDumping()
void Renderer::DoDumpFrame()
{
UpdateFrameDumpTexture(m_last_xfb_horizontal_scale);
UpdateFrameDumpTexture();
auto result = m_dump_texture->Map();
if (result.has_value())
@ -704,7 +708,7 @@ void Renderer::DoDumpFrame()
}
}
void Renderer::UpdateFrameDumpTexture(float horizontal_scale)
void Renderer::UpdateFrameDumpTexture()
{
int target_width, target_height;
std::tie(target_width, target_height) = CalculateOutputDimensions(
@ -719,9 +723,7 @@ void Renderer::UpdateFrameDumpTexture(float horizontal_scale)
config.rendertarget = true;
m_dump_texture = g_texture_cache->CreateTexture(config);
}
auto source_rect = m_last_xfb_texture->GetConfig().GetRect();
source_rect.right /= horizontal_scale;
m_dump_texture->CopyRectangleFromTexture(m_last_xfb_texture, source_rect,
m_dump_texture->CopyRectangleFromTexture(m_last_xfb_texture, m_last_xfb_region,
EFBRectangle{0, 0, target_width, target_height});
}

4
Source/Core/VideoCommon/RenderBase.h
View file

@ -185,7 +185,7 @@ private:
void RunFrameDumps();
void ShutdownFrameDumping();
std::tuple<int, int> CalculateOutputDimensions(int width, int height);
void UpdateFrameDumpTexture(float horizontal_scale);
void UpdateFrameDumpTexture();
PEControl::PixelFormat m_prev_efb_format = PEControl::INVALID_FMT;
unsigned int m_efb_scale = 1;
@ -214,7 +214,7 @@ private:
AbstractTexture* m_last_xfb_texture = nullptr;
u64 m_last_xfb_id = std::numeric_limits<u64>::max();
u64 m_last_xfb_ticks = 0;
float m_last_xfb_horizontal_scale = 0.0f;
EFBRectangle m_last_xfb_region;
std::unique_ptr<AbstractTexture> m_dump_texture;