MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00
Code Issues Projects Releases Wiki Activity

Revert VI.height calculation. Add flag VI.interlaced for interlaced mode.

Browse Source
This commit is contained in:
Sergey Lipskiy 2014-09-26 19:28:15 +07:00
parent 4499a6f966
commit 400f674409
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
VI.cpp
View File

@ -14,19 +14,19 @@ VIInfo VI;
void VI_UpdateSize() void VI_UpdateSize()
{ {
f32 xScale = _FIXED2FLOAT( _SHIFTR( *REG.VI_X_SCALE, 0, 12 ), 10 ); const f32 xScale = _FIXED2FLOAT( _SHIFTR( *REG.VI_X_SCALE, 0, 12 ), 10 );
f32 xOffset = _FIXED2FLOAT( _SHIFTR( *REG.VI_X_SCALE, 16, 12 ), 10 ); // f32 xOffset = _FIXED2FLOAT( _SHIFTR( *REG.VI_X_SCALE, 16, 12 ), 10 );
f32 yScale = _FIXED2FLOAT( _SHIFTR( *REG.VI_Y_SCALE, 0, 12 ), 10 ); const f32 yScale = _FIXED2FLOAT( _SHIFTR( *REG.VI_Y_SCALE, 0, 12 ), 10 );
f32 yOffset = _FIXED2FLOAT( _SHIFTR( *REG.VI_Y_SCALE, 16, 12 ), 10 ); // f32 yOffset = _FIXED2FLOAT( _SHIFTR( *REG.VI_Y_SCALE, 16, 12 ), 10 );
u32 hEnd = _SHIFTR( *REG.VI_H_START, 0, 10 ); const u32 hEnd = _SHIFTR( *REG.VI_H_START, 0, 10 );
u32 hStart = _SHIFTR( *REG.VI_H_START, 16, 10 ); const u32 hStart = _SHIFTR( *REG.VI_H_START, 16, 10 );
// Shift an extra bit if not in interlaced mode // These are in half-lines, so shift an extra bit
u32 extraShift = (*REG.VI_STATUS & 0x40) == 0x40 ? 0 : 1; const u32 vEnd = _SHIFTR( *REG.VI_V_START, 1, 9 );
u32 vEnd = _SHIFTR( *REG.VI_V_START, 0 + extraShift, 10 - extraShift ); const u32 vStart = _SHIFTR( *REG.VI_V_START, 17, 9 );
u32 vStart = _SHIFTR( *REG.VI_V_START, 16 + extraShift, 10 - extraShift ); VI.interlaced = (*REG.VI_STATUS & 0x40) != 0;
VI.width = (hEnd - hStart) * xScale; VI.width = (hEnd - hStart) * xScale;
VI.real_height = (vEnd - vStart) * yScale; VI.real_height = (vEnd - vStart) * yScale;
@ -38,8 +38,10 @@ void VI_UpdateSize()
VI.vHeight = VI.height; VI.vHeight = VI.height;
} }
if (VI.width == 0.0f) VI.width = *REG.VI_WIDTH; if (VI.width == 0.0f)
if (VI.height == 0.0f) VI.height = 240.0f; VI.width = *REG.VI_WIDTH;
if (VI.height == 0.0f)
VI.height = 240.0f;
VI.rwidth = 1.0f / VI.width; VI.rwidth = 1.0f / VI.width;
VI.rheight = 1.0f / VI.height; VI.rheight = 1.0f / VI.height;
} }

10
VI.h
View File

@ -4,12 +4,18 @@
struct VIInfo struct VIInfo
{ {
u32 width, height, real_height; u32 width;
u32 height, real_height;
f32 rwidth, rheight; f32 rwidth, rheight;
u32 vStart, vEnd, vHeight; u32 vStart, vEnd, vHeight;
u32 lastOrigin; u32 lastOrigin;
bool interlaced;
VIInfo() : width(0), height(0), real_height(0), vStart(0), vEnd(0), vHeight(0), lastOrigin(0) {} VIInfo() :
width(0), height(0), real_height(0),
vStart(0), vEnd(0), vHeight(0), lastOrigin(0),
interlaced(false)
{}
}; };
extern VIInfo VI; extern VIInfo VI;