empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added NTSC_VideoGetChromaTable(), _NTSC_VideoInitChroma()

Browse source
This commit is contained in:
michaelangel007 2015-01-08 12:05:23 -08:00
parent 1fb2e412fd
commit c13fb849a5
2 changed files with 51 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
source/NTSC.cpp
View file

@ -174,10 +174,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
const uint32_t ALPHA32_MASK = 0xFF000000; // Win32: aarrggbb
static bgra_t g_aBnWMonitor [NTSC_NUM_SEQUENCES];
static bgra_t g_aHueMonitor[NTSC_NUM_PHASES][NTSC_NUM_SEQUENCES];
static bgra_t g_aBnwColorTV [NTSC_NUM_SEQUENCES];
static bgra_t g_aHueColorTV[NTSC_NUM_PHASES][NTSC_NUM_SEQUENCES];
/*extern*/ uint32_t g_nChromaSize = 0; // for NTSC_VideoGetChromaTable()
static bgra_t g_aBnWMonitor [NTSC_NUM_SEQUENCES];
static bgra_t g_aHueMonitor[NTSC_NUM_PHASES][NTSC_NUM_SEQUENCES];
static bgra_t g_aBnwColorTV [NTSC_NUM_SEQUENCES];
static bgra_t g_aHueColorTV[NTSC_NUM_PHASES][NTSC_NUM_SEQUENCES];
// g_aBnWMonitor * g_nMonochromeRGB -> g_aBnWMonitorCustom
// g_aBnwColorTV * g_nMonochromeRGB -> g_aBnWColorTVCustom
@ -1390,6 +1391,43 @@ void updateScreenText80 (long cycles6502)
// Functions (Public) _____________________________________________________________________________
//===========================================================================
uint32_t*NTSC_VideoGetChromaTable( bool bHueTypeMonochrome, bool bMonitorTypeColorTV )
{
if( bHueTypeMonochrome )
{
g_nChromaSize = sizeof( g_aBnwColorTV );
if( bMonitorTypeColorTV )
return (uint32_t*) g_aBnwColorTV;
else
return (uint32_t*) g_aBnWMonitor;
} else {
g_nChromaSize = sizeof( g_aHueColorTV );
if( bMonitorTypeColorTV )
return (uint32_t*) g_aHueColorTV;
else
return (uint32_t*) g_aHueMonitor;
}
}
//===========================================================================
uint16_t NTSC_VideoGetScannerAddress ( unsigned long cycles6502 )
{
(void)cycles6502;
int nHires = (g_uVideoMode & VF_HIRES) && !(g_uVideoMode & VF_TEXT); // (SW_HIRES && !SW_TEXT) ? 1 : 0;
if( nHires )
updateVideoScannerAddressHGR();
else
updateVideoScannerAddressTXT();
// Required for ANSI STORY vert scrolling mid-scanline mixed mode: DGR80, TEXT80, DGR80
uint8_t hclock = (g_nVideoClockHorz + VIDEO_SCANNER_MAX_HORZ - 2) % VIDEO_SCANNER_MAX_HORZ; // Optimization: (h-2)
return g_aHorzClockMemAddress[ hclock ];
}
//===========================================================================
void NTSC_SetVideoTextMode( int cols )
{
@ -1537,22 +1575,6 @@ _mono:
}
}
//===========================================================================
uint16_t NTSC_VideoGetScannerAddress ( unsigned long cycles6502 )
{
(void)cycles6502;
int nHires = (g_uVideoMode & VF_HIRES) && !(g_uVideoMode & VF_TEXT); // (SW_HIRES && !SW_TEXT) ? 1 : 0;
if( nHires )
updateVideoScannerAddressHGR();
else
updateVideoScannerAddressTXT();
// Required for ANSI STORY vert scrolling mid-scanline mixed mode: DGR80, TEXT80, DGR80
uint8_t hclock = (g_nVideoClockHorz + VIDEO_SCANNER_MAX_HORZ - 2) % VIDEO_SCANNER_MAX_HORZ; // Optimization: (h-2)
return g_aHorzClockMemAddress[ hclock ];
}
//===========================================================================
void NTSC_VideoInit( uint8_t* pFramebuffer ) // wsVideoInit
{
@ -1643,6 +1665,12 @@ void NTSC_VideoInitAppleType ()
}
//===========================================================================
void NTSC_VideoInitChroma()
{
initChromaPhaseTables();
}
//===========================================================================
bool NTSC_VideoIsVbl ()
{

3
source/NTSC.h
View file

@ -4,14 +4,17 @@
// Globals (Public)
extern uint16_t g_nVideoClockVert;
extern uint16_t g_nVideoClockHorz;
extern uint32_t g_nChromaSize;
// Prototypes (Public) ________________________________________________
extern void NTSC_SetVideoMode( int bVideoModeFlags );
extern void NTSC_SetVideoStyle();
extern void NTSC_SetVideoTextMode( int cols );
extern uint32_t*NTSC_VideoGetChromaTable( bool bHueTypeMonochrome, bool bMonitorTypeColorTV );
extern uint16_t NTSC_VideoGetScannerAddress( unsigned long cycles6502 );
extern void NTSC_VideoInit( uint8_t *pFramebuffer );
extern void NTSC_VideoInitAppleType ();
extern void NTSC_VideoInitChroma();
extern bool NTSC_VideoIsVbl();
extern void NTSC_VideoUpdateCycles( long cycles6502 );