ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VI: Fix vert beam position inaccuracy

This commit is contained in:
booto 2015-09-18 02:55:09 +08:00
parent e278587023
commit ea6af0e98b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/HW/VideoInterface.cpp
View File

@ -4,6 +4,7 @@
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
@ -286,7 +287,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
// MMIOs with unimplemented writes that trigger warnings. // MMIOs with unimplemented writes that trigger warnings.
mmio->Register(base | VI_VERTICAL_BEAM_POSITION, mmio->Register(base | VI_VERTICAL_BEAM_POSITION,
MMIO::ComplexRead<u16>([](u32) { MMIO::ComplexRead<u16>([](u32) {
return (s_half_line_count + 1) / 2; return 1 + (s_half_line_count-1) / 2;
}), }),
MMIO::ComplexWrite<u16>([](u32, u16 val) { MMIO::ComplexWrite<u16>([](u32, u16 val) {
WARN_LOG(VIDEOINTERFACE, "Changing vertical beam position to 0x%04x - not documented or implemented yet", val); WARN_LOG(VIDEOINTERFACE, "Changing vertical beam position to 0x%04x - not documented or implemented yet", val);
@ -294,7 +295,8 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
); );
mmio->Register(base | VI_HORIZONTAL_BEAM_POSITION, mmio->Register(base | VI_HORIZONTAL_BEAM_POSITION,
MMIO::ComplexRead<u16>([](u32) { MMIO::ComplexRead<u16>([](u32) {
return static_cast<u16>(m_HTiming0.HLW * (CoreTiming::GetTicks() - s_ticks_last_line_start) / GetTicksPerHalfLine()); u16 value = static_cast<u16>(1 + m_HTiming0.HLW * (CoreTiming::GetTicks() - s_ticks_last_line_start) / (GetTicksPerHalfLine()));
return MathUtil::Clamp(value, static_cast<u16>(1), static_cast<u16>(m_HTiming0.HLW * 2));
}), }),
MMIO::ComplexWrite<u16>([](u32, u16 val) { MMIO::ComplexWrite<u16>([](u32, u16 val) {
WARN_LOG(VIDEOINTERFACE, "Changing horizontal beam position to 0x%04x - not documented or implemented yet", val); WARN_LOG(VIDEOINTERFACE, "Changing horizontal beam position to 0x%04x - not documented or implemented yet", val);
@ -624,7 +626,7 @@ void Update()
for (UVIInterruptRegister& reg : m_InterruptRegister) for (UVIInterruptRegister& reg : m_InterruptRegister)
{ {
if (s_half_line_count == 2 * reg.VCT) if (s_half_line_count + 1 == 2 * reg.VCT)
{ {
reg.IR_INT = 1; reg.IR_INT = 1;
} }