finally all windows builds compile again
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3812 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
fdc2b69143
commit
72b0405ef6
|
@ -1096,12 +1096,6 @@ int getTicksPerLine() {
|
||||||
|
|
||||||
static void BeginField(FieldType field)
|
static void BeginField(FieldType field)
|
||||||
{
|
{
|
||||||
static const char* const fieldTypeNames[] = { "Progressive", "Upper", "Lower" };
|
|
||||||
DEBUG_LOG(VIDEOINTERFACE, "(VI->BeginField): addr: %.08X | FieldSteps %u | FbSteps %u | ACV %u | Field %s",
|
|
||||||
xfbAddr, m_HorizontalStepping.FieldSteps, m_HorizontalStepping.FbSteps, m_VerticalTimingRegister.ACV,
|
|
||||||
fieldTypeNames[field]
|
|
||||||
);
|
|
||||||
|
|
||||||
u32 fbWidth = m_HorizontalStepping.FieldSteps * 16;
|
u32 fbWidth = m_HorizontalStepping.FieldSteps * 16;
|
||||||
u32 fbHeight = (m_HorizontalStepping.FbSteps / m_HorizontalStepping.FieldSteps) * m_VerticalTimingRegister.ACV;
|
u32 fbHeight = (m_HorizontalStepping.FbSteps / m_HorizontalStepping.FieldSteps) * m_VerticalTimingRegister.ACV;
|
||||||
|
|
||||||
|
@ -1111,6 +1105,13 @@ static void BeginField(FieldType field)
|
||||||
|
|
||||||
u32 xfbAddr = (field == FIELD_LOWER) ? GetXFBAddressBottom() : GetXFBAddressTop();
|
u32 xfbAddr = (field == FIELD_LOWER) ? GetXFBAddressBottom() : GetXFBAddressTop();
|
||||||
|
|
||||||
|
static const char* const fieldTypeNames[] = { "Progressive", "Upper", "Lower" };
|
||||||
|
|
||||||
|
DEBUG_LOG(VIDEOINTERFACE, "(VI->BeginField): addr: %.08X | FieldSteps %u | FbSteps %u | ACV %u | Field %s",
|
||||||
|
xfbAddr, m_HorizontalStepping.FieldSteps, m_HorizontalStepping.FbSteps, m_VerticalTimingRegister.ACV,
|
||||||
|
fieldTypeNames[field]
|
||||||
|
);
|
||||||
|
|
||||||
Common::PluginVideo* video = CPluginManager::GetInstance().GetVideo();
|
Common::PluginVideo* video = CPluginManager::GetInstance().GetVideo();
|
||||||
if (xfbAddr && video->IsValid())
|
if (xfbAddr && video->IsValid())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue