80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #3182 from Cacodemon345/matrox-mga-multi-monitor

Browse Source 
vid_mga: Make Matrox Millennium multi-monitor compatible
This commit is contained in:
Miran Grča
2023-03-07 20:17:25 +01:00
committed by GitHub
parent a4ff1f72c8 03a578708c
commit d66a795ac8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/vid_mga.c
View File

@@ -5126,9 +5126,9 @@ mystique_hwcursor_draw(svga_t *svga, int displine)
case XCURCTRL_CURMODE_XGA: case XCURCTRL_CURMODE_XGA:
for (x = 0; x < 64; x++) { for (x = 0; x < 64; x++) {
if (!(dat[1] & (1ull << 63))) if (!(dat[1] & (1ull << 63)))
buffer32->line[displine][offset + svga->x_add] = (dat[0] & (1ull << 63)) ? mystique->cursor.col[1] : mystique->cursor.col[0]; svga->monitor->target_buffer->line[displine][offset + svga->x_add] = (dat[0] & (1ull << 63)) ? mystique->cursor.col[1] : mystique->cursor.col[0];
else if (dat[0] & (1ull << 63)) else if (dat[0] & (1ull << 63))
buffer32->line[displine][offset + svga->x_add] ^= 0xffffff; svga->monitor->target_buffer->line[displine][offset + svga->x_add] ^= 0xffffff;
offset++; offset++;
dat[0] <<= 1; dat[0] <<= 1;

2
src/video/vid_table.c
View File

@@ -199,7 +199,7 @@ video_cards[] = {
{ &s3_diamond_stealth_4000_pci_device }, { &s3_diamond_stealth_4000_pci_device },
{ &s3_trio3d2x_pci_device }, { &s3_trio3d2x_pci_device },
#if defined(DEV_BRANCH) && defined(USE_MGA) #if defined(DEV_BRANCH) && defined(USE_MGA)
{ &millennium_device }, { &millennium_device, VIDEO_FLAG_TYPE_SPECIAL },
{ &mystique_device }, { &mystique_device },
{ &mystique_220_device }, { &mystique_220_device },
#endif #endif

2
src/video/vid_tvp3026_ramdac.c
View File

@@ -489,7 +489,7 @@ tvp3026_hwcursor_draw(svga_t *svga, int displine)
y_pos = displine; y_pos = displine;
x_pos = offset + svga->x_add; x_pos = offset + svga->x_add;
p = buffer32->line[y_pos]; p = svga->monitor->target_buffer->line[y_pos];
if (offset >= svga->dac_hwcursor_latch.x) { if (offset >= svga->dac_hwcursor_latch.x) {
switch (mode) { switch (mode) {