piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

added option to use XFB in GL, but XFB support still needs work. modified viewport to include scissor offset.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@879 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
donkopunchstania
2008-10-15 14:07:03 +00:00
parent 70eebcb3a3
commit bbbe898839
17 changed files with 416 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

214
Source/Core/Core/Src/HW/VideoInterface.cpp
View File

@ -32,9 +32,12 @@ namespace VideoInterface
// VI Internal Hardware Addresses
enum
{
VI_VERTICAL_TIMING = 0x0,
VI_CONTROL_REGISTER = 0x02,
VI_FRAMEBUFFER_1 = 0x01C,
VI_FRAMEBUFFER_2 = 0x024,
VI_FRAMEBUFFER_TOP_HI = 0x01C,
VI_FRAMEBUFFER_TOP_LO = 0x01E,
VI_FRAMEBUFFER_BOTTOM_HI = 0x024,
VI_FRAMEBUFFER_BOTTOM_LO = 0x026,
VI_VERTICAL_BEAM_POSITION = 0x02C,
VI_HORIZONTAL_BEAM_POSITION = 0x02e,
VI_PRERETRACE = 0x030,
@ -42,8 +45,22 @@ enum
VI_DI2 = 0x038,
VI_DI3 = 0x03C,
VI_INTERLACE = 0x850,
VI_HSCALEW = 0x04A,
VI_HSCALER = 0x04C,
VI_HSCALEW = 0x048,
VI_HSCALER = 0x04A,
VI_FBWIDTH = 0x070,
};
union UVIVerticalTimingRegister
{
u16 Hex;
struct
{
unsigned EQU : 4;
unsigned ACV : 10;
unsigned : 2;
};
UVIVerticalTimingRegister(u16 _hex) { Hex = _hex;}
UVIVerticalTimingRegister() { Hex = 0;}
};
union UVIDisplayControlRegister
@ -85,16 +102,57 @@ union UVIInterruptRegister
};
};
union UVIHorizontalStepping
{
u16 Hex;
struct
{
unsigned FbSteps : 8;
unsigned FieldSteps : 8;
};
};
union UVIHorizontalScaling
{
u16 Hex;
struct
{
unsigned STP : 9;
unsigned : 3;
unsigned HS_EN : 1;
unsigned : 3;
};
UVIHorizontalScaling(u16 _hex) { Hex = _hex;}
UVIHorizontalScaling() { Hex = 0;}
};
union UVIFrameBufferAddress
{
u32 Hex;
struct
{
u16 Lo;
u16 Hi;
};
UVIFrameBufferAddress(u16 _hex) { Hex = _hex;}
UVIFrameBufferAddress() { Hex = 0;}
};
// STATE_TO_SAVE
static UVIVerticalTimingRegister m_VIVerticalTimingRegister;
static UVIDisplayControlRegister m_VIDisplayControlRegister;
// Framebuffers
static u32 m_FrameBuffer1; // normal framebuffer address
static u32 m_FrameBuffer2; // framebuffer for 3d buffer address
static UVIFrameBufferAddress m_FrameBufferTop; // normal framebuffer address
static UVIFrameBufferAddress m_FrameBufferBottom;
// VI Interrupt Registers
static UVIInterruptRegister m_VIInterruptRegister[4];
static UVIHorizontalStepping m_VIHorizontalStepping;
static UVIHorizontalScaling m_VIHorizontalScaling;
u8 m_UVIUnknownRegs[0x1000];
static u16 HorizontalBeamPos = 0;
@ -102,19 +160,26 @@ static u16 VerticalBeamPos = 0;
static u32 TicksPerFrame = 0;
static u32 LineCount = 0;
static u32 LinesPerField = 0;
static u64 LastTime = 0;
static u32 NextXFBRender = 0;
// only correct when scaling is enabled?
static u16 FbWidth = 0;
void DoState(PointerWrap &p)
{
p.Do(m_VIVerticalTimingRegister);
p.Do(m_VIDisplayControlRegister);
p.Do(m_FrameBuffer1);
p.Do(m_FrameBuffer2);
p.Do(m_FrameBufferTop);
p.Do(m_FrameBufferBottom);
p.Do(m_VIInterruptRegister);
p.DoArray(m_UVIUnknownRegs, 0x1000);
p.DoArray(m_UVIUnknownRegs, 0x1000);
p.Do(HorizontalBeamPos);
p.Do(VerticalBeamPos);
p.Do(TicksPerFrame);
p.Do(LineCount);
p.Do(LinesPerField);
p.Do(LastTime);
}
@ -126,17 +191,39 @@ void Init()
m_VIDisplayControlRegister.Hex = 0x0000;
m_VIDisplayControlRegister.ENB = 0;
m_VIDisplayControlRegister.FMT = 0;
NextXFBRender = 1;
}
void Read16(u16& _uReturnValue, const u32 _iAddress)
{
switch (_iAddress & 0xFFF)
{
case VI_VERTICAL_TIMING:
_uReturnValue = m_VIVerticalTimingRegister.Hex;
return;
case VI_CONTROL_REGISTER:
LOG(VIDEOINTERFACE, "VideoInterface(r16): VI_CONTROL_REGISTER 0x%08x", m_VIDisplayControlRegister.Hex);
_uReturnValue = m_VIDisplayControlRegister.Hex;
return;
case VI_FRAMEBUFFER_TOP_HI:
_uReturnValue = m_FrameBufferTop.Hi;
break;
case VI_FRAMEBUFFER_TOP_LO:
_uReturnValue = m_FrameBufferTop.Lo;
break;
case VI_FRAMEBUFFER_BOTTOM_HI:
_uReturnValue = m_FrameBufferBottom.Hi;
break;
case VI_FRAMEBUFFER_BOTTOM_LO:
_uReturnValue = m_FrameBufferBottom.Lo;
break;
case VI_VERTICAL_BEAM_POSITION:
_uReturnValue = VerticalBeamPos;
return;
@ -154,15 +241,27 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
_uReturnValue = m_VIInterruptRegister[1].Hi;
return;
case 0x38:
case VI_DI2:
_uReturnValue = m_VIInterruptRegister[2].Hi;
return;
case 0x3C:
case VI_DI3:
_uReturnValue = m_VIInterruptRegister[3].Hi;
return;
default:
case VI_HSCALEW:
_uReturnValue = m_VIHorizontalStepping.Hex;
break;
case VI_HSCALER:
_uReturnValue = m_VIHorizontalScaling.Hex;
break;
case VI_FBWIDTH:
_uReturnValue = FbWidth;
break;
default:
_uReturnValue = *(u16*)&m_UVIUnknownRegs[_iAddress & 0xFFF];
return;
}
@ -178,6 +277,10 @@ void Write16(const u16 _iValue, const u32 _iAddress)
switch (_iAddress & 0xFFF)
{
case VI_VERTICAL_TIMING:
m_VIVerticalTimingRegister.Hex = _iValue;
break;
case VI_CONTROL_REGISTER:
{
UVIDisplayControlRegister tmpConfig(_iValue);
@ -197,6 +300,22 @@ void Write16(const u16 _iValue, const u32 _iAddress)
}
break;
case VI_FRAMEBUFFER_TOP_HI:
m_FrameBufferTop.Hi = _iValue;
break;
case VI_FRAMEBUFFER_TOP_LO:
m_FrameBufferTop.Lo = _iValue;
break;
case VI_FRAMEBUFFER_BOTTOM_HI:
m_FrameBufferBottom.Hi = _iValue;
break;
case VI_FRAMEBUFFER_BOTTOM_LO:
m_FrameBufferBottom.Lo = _iValue;
break;
case VI_VERTICAL_BEAM_POSITION:
_dbg_assert_(VIDEOINTERFACE,0);
break;
@ -225,17 +344,19 @@ void Write16(const u16 _iValue, const u32 _iAddress)
m_VIInterruptRegister[3].Hi = _iValue;
UpdateInterrupts();
break;
case VI_HSCALEW:
{
// int width = _iValue&0x3FF;
}
m_VIHorizontalStepping.Hex = _iValue;
break;
case VI_HSCALER:
{
// int hsEnable = (_iValue&(1<<12)) ? true : false;
}
m_VIHorizontalScaling.Hex = _iValue;
break;
case VI_FBWIDTH:
FbWidth = _iValue;
break;
default:
*(u16*)&m_UVIUnknownRegs[_iAddress & 0xFFF] = _iValue;
break;
@ -270,24 +391,12 @@ void Read32(u32& _uReturnValue, const u32 _iAddress)
void Write32(const u32 _iValue, const u32 _iAddress)
{
LOG(VIDEOINTERFACE, "(w32): 0x%08x, 0x%08x",_iValue,_iAddress);
switch(_iAddress & 0xFFF)
{
case VI_FRAMEBUFFER_1:
m_FrameBuffer1 = _iValue;
break;
case VI_FRAMEBUFFER_2:
m_FrameBuffer2 = _iValue;
break;
default:
// Allow 32-bit writes to the VI: although this is officially not
// allowed, the hardware seems to accept it (for example, DesktopMan GC
// Tetris uses it).
Write16(_iValue >> 16, _iAddress);
Write16(_iValue & 0xFFFF, _iAddress + 2);
break;
}
// Allow 32-bit writes to the VI: although this is officially not
// allowed, the hardware seems to accept it (for example, DesktopMan GC
// Tetris uses it).
Write16(_iValue >> 16, _iAddress);
Write16(_iValue & 0xFFFF, _iAddress + 2);
}
void UpdateInterrupts()
@ -327,7 +436,7 @@ void GenerateVIInterrupt(VIInterruptType _VIInterrupt)
u8* GetFrameBufferPointer()
{
return Memory::GetPointer(VideoInterface::m_FrameBuffer1);
return Memory::GetPointer(VideoInterface::m_FrameBufferTop.Hex);
}
void PreInit(bool _bNTSC)
@ -355,6 +464,7 @@ void PreInit(bool _bNTSC)
Write16(0x01ae, 0xcc002032);
Write16(0x1107, 0xcc002030);
Write16(0x0000, 0xcc00206c);
Write16(0x0001, 0xcc00206e); // component cable is connected
if (_bNTSC)
Write16(0x0001, 0xcc002002); // STATUS REG
@ -370,11 +480,13 @@ void UpdateTiming()
case 2:
TicksPerFrame = SystemTimers::GetTicksPerSecond() / 30;
LineCount = m_VIDisplayControlRegister.NIN ? 263 : 525;
LinesPerField = 263;
break;
case 1:
TicksPerFrame = SystemTimers::GetTicksPerSecond() / 25;
LineCount = m_VIDisplayControlRegister.NIN ? 313 : 625;
LinesPerField = 313;
break;
default:
@ -395,6 +507,32 @@ void Update()
{
VerticalBeamPos = 1;
}
if(VerticalBeamPos == NextXFBRender)
{
u8* xfbPtr = 0;
int yOffset = 0;
if(NextXFBRender == 1)
{
NextXFBRender = LinesPerField;
xfbPtr = Memory::GetPointer(VideoInterface::m_FrameBufferTop.Hex);
}
else
{
NextXFBRender = 1;
xfbPtr = Memory::GetPointer(VideoInterface::m_FrameBufferBottom.Hex);
yOffset = -1;
}
if(xfbPtr && PluginVideo::IsLoaded())
{
int fbWidth = m_VIHorizontalStepping.FieldSteps * 16;
int fbHeight = (m_VIHorizontalStepping.FbSteps / m_VIHorizontalStepping.FieldSteps) * m_VIVerticalTimingRegister.ACV;
PluginVideo::Video_UpdateXFB(xfbPtr, fbWidth, fbHeight, yOffset);
}
}
// check INT_PRERETRACE
if (m_VIInterruptRegister[0].VCT == VerticalBeamPos)

2
Source/Core/Core/Src/Plugins/Plugin_Video.h
View File

@ -39,7 +39,7 @@ typedef void (__cdecl* TVideo_Initialize)(SVideoInitialize*);
typedef void (__cdecl* TVideo_Prepare)();
typedef void (__cdecl* TVideo_Shutdown)();
typedef void (__cdecl* TVideo_SendFifoData)(u8*);
typedef void (__cdecl* TVideo_UpdateXFB)(u8*, u32, u32);
typedef void (__cdecl* TVideo_UpdateXFB)(u8*, u32, u32, s32);
typedef BOOL (__cdecl* TVideo_Screenshot)(TCHAR*);
typedef void (__cdecl* TVideo_EnterLoop)();
typedef void (__cdecl* TVideo_AddMessage)(const char* pstr, unsigned int milliseconds);

67
Source/Core/VideoCommon/Src/XFBConvert.cpp
View File

@ -34,26 +34,53 @@ void yuv2rgb(int y, int u, int v, int &r, int &g, int &b)
r = bound((76283*(y - 16) + 104595*(v - 128))>>16);
}
} // namespace
void ConvertXFB(u32 *dst, const u8* _pXFB, int width, int height)
void rgb2yuv(int r, int g, int b, int &y, int &u, int &v)
{
const unsigned char *src = _pXFB;
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++, src += 4)
{
int Y1 = src[0];
int U = src[1];
int Y2 = src[2];
int V = src[3];
int r, g, b;
yuv2rgb(Y1,U,V, r,g,b);
*dst++ = 0xFF000000 | (r<<16) | (g<<8) | (b);
yuv2rgb(Y2,U,V, r,g,b);
*dst++ = 0xFF000000 | (r<<16) | (g<<8) | (b);
}
}
y = (((16843 * r) + (33030 * g) + (6423 * b)) >> 16) + 16;
v = (((28770 * r) - (24117 * g) - (4653 * b)) >> 16) + 128;
u = ((-(9699 * r) - (19071 * g) + (28770 * b)) >> 16) + 128;
}
} // namespace
void ConvertFromXFB(u32 *dst, const u8* _pXFB, int width, int height)
{
const unsigned char *src = _pXFB;
u32 numBlocks = (width * height) / 2;
for (u32 i = 0; i < numBlocks; i++, src += 4)
{
int Y1 = src[0];
int U = src[1];
int Y2 = src[2];
int V = src[3];
int r, g, b;
yuv2rgb(Y1,U,V, r,g,b);
*dst++ = 0xFF000000 | (r<<16) | (g<<8) | (b);
yuv2rgb(Y2,U,V, r,g,b);
*dst++ = 0xFF000000 | (r<<16) | (g<<8) | (b);
}
}
void ConvertToXFB(u32 *dst, const u8* _pEFB, int width, int height)
{
const unsigned char *src = _pEFB;
u32 numBlocks = (width * height) / 2;
for (u32 i = 0; i < numBlocks; i++)
{
int y1 = (((16843 * src[0]) + (33030 * src[1]) + (6423 * src[2])) >> 16) + 16;
int u1 = ((-(9699 * src[0]) - (19071 * src[1]) + (28770 * src[2])) >> 16) + 128;
src += 4;
int y2 = (((16843 * src[0]) + (33030 * src[1]) + (6423 * src[2])) >> 16) + 16;
int v2 = (((28770 * src[0]) - (24117 * src[1]) - (4653 * src[2])) >> 16) + 128;
src += 4;
*dst++ = (v2 << 24) | (y2 << 16) | (u1 << 8) | (y1);
}
}

5
Source/Core/VideoCommon/Src/XFBConvert.h
View File

@ -20,6 +20,9 @@
#include "Common.h"
void ConvertXFB(u32 *dst, const u8* _pXFB, int width, int height);
void ConvertFromXFB(u32 *dst, const u8* _pXFB, int width, int height);
// converts 32-bit RGBA data to 16-bit 4:2:2 YUV data
void ConvertToXFB(u32 *dst, const u8* _pEFB, int width, int height);
#endif