apple2video: Fixed another regression where composite double-hi-res was usually monochrome. [R. Belmont]

This commit is contained in:
arbee 2023-04-12 15:25:05 -04:00
parent 3c3db3c89d
commit 81dd75f7d7

View File

@ -640,6 +640,7 @@ void a2_video_device::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, c
endrow = (std::min)(endrow, cliprect.bottom());
int const startcol = (cliprect.left() / 14);
int const stopcol = (cliprect.right() / 14) + 1;
const bool bIsRGBMonitor = rgb_monitor();
uint8_t const *const vram = &m_ram_ptr[page];
uint8_t const *const vaux = (m_aux_ptr ? m_aux_ptr : vram) + page;
@ -714,7 +715,7 @@ void a2_video_device::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, c
{
unsigned const w = words[col] + (words[col+1] << 14);
unsigned const color_mask = (rgbmode == 3) ? -1u :
unsigned const color_mask = (rgbmode == 3 || !bIsRGBMonitor) ? -1u :
(vaux_row[col] >> 7) * 0x7f + (vram_row[col] >> 7) * 0x3f80
+ (vaux_row[col+1] >> 7) * 0x1fc000 + (vram_row[col+1] >> 7) * 0xfe00000;