claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fixed hardware cursor drawing when EGA/(S)VGA overscan is enabled for every graphics card that supports hardware cursor acceleration.

Browse Source
This commit is contained in:
OBattler
2018-07-16 01:43:12 +02:00
parent 950ce8f5aa
commit 16b024c24f
6 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/vid_ati_mach64.c
View File

@@ -8,7 +8,7 @@
* *
* ATi Mach64 graphics card emulation. * ATi Mach64 graphics card emulation.
* *
* Version: @(#)vid_ati_mach64.c 1.0.21 2018/04/29 * Version: @(#)vid_ati_mach64.c 1.0.22 2018/07/16
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -2780,8 +2780,10 @@ void mach64_hwcursor_draw(svga_t *svga, int displine)
uint8_t dat; uint8_t dat;
uint32_t col0 = mach64->ramdac.pallook[0]; uint32_t col0 = mach64->ramdac.pallook[0];
uint32_t col1 = mach64->ramdac.pallook[1]; uint32_t col1 = mach64->ramdac.pallook[1];
int y_add = (enable_overscan && !suppress_overscan) ? 16 : 0; int y_add, x_add;
int x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
y_add = (enable_overscan && !suppress_overscan) ? (overscan_y >> 1) : 0;
x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
offset = svga->hwcursor_latch.xoff; offset = svga->hwcursor_latch.xoff;
for (x = 0; x < 64 - svga->hwcursor_latch.xoff; x += 4) for (x = 0; x < 64 - svga->hwcursor_latch.xoff; x += 4)

8
src/video/vid_cl54xx.c
View File

@@ -9,7 +9,7 @@
* Emulation of select Cirrus Logic cards (CL-GD 5428, * Emulation of select Cirrus Logic cards (CL-GD 5428,
* CL-GD 5429, CL-GD 5430, CL-GD 5434 and CL-GD 5436 are supported). * CL-GD 5429, CL-GD 5430, CL-GD 5434 and CL-GD 5436 are supported).
* *
* Version: @(#)vid_cl_54xx.c 1.0.19 2018/05/08 * Version: @(#)vid_cl_54xx.c 1.0.20 2018/07/16
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Barry Rodewald, * Barry Rodewald,
@@ -855,12 +855,14 @@ void gd54xx_hwcursor_draw(svga_t *svga, int displine)
int x, xx, comb, b0, b1; int x, xx, comb, b0, b1;
uint8_t dat[2]; uint8_t dat[2];
int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff; int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
int y_add = (enable_overscan && !suppress_overscan) ? 16 : 0; int y_add, x_add;
int x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
int pitch = (svga->hwcursor.xsize == 64) ? 16 : 4; int pitch = (svga->hwcursor.xsize == 64) ? 16 : 4;
uint32_t bgcol = gd54xx->extpallook[0x00]; uint32_t bgcol = gd54xx->extpallook[0x00];
uint32_t fgcol = gd54xx->extpallook[0x0f]; uint32_t fgcol = gd54xx->extpallook[0x0f];
y_add = (enable_overscan && !suppress_overscan) ? (overscan_y >> 1) : 0;
x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
if (svga->interlace && svga->hwcursor_oddeven) if (svga->interlace && svga->hwcursor_oddeven)
svga->hwcursor_latch.addr += pitch; svga->hwcursor_latch.addr += pitch;

8
src/video/vid_et4000w32.c
View File

@@ -10,7 +10,7 @@
* *
* Known bugs: Accelerator doesn't work in planar modes * Known bugs: Accelerator doesn't work in planar modes
* *
* Version: @(#)vid_et4000w32.c 1.0.10 2018/04/29 * Version: @(#)vid_et4000w32.c 1.0.11 2018/07/16
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -1077,10 +1077,12 @@ void et4000w32p_hwcursor_draw(svga_t *svga, int displine)
{ {
int x, offset; int x, offset;
uint8_t dat; uint8_t dat;
int y_add = (enable_overscan && !suppress_overscan) ? 16 : 0; int y_add, x_add;
int x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
offset = svga->hwcursor_latch.xoff; offset = svga->hwcursor_latch.xoff;
y_add = (enable_overscan && !suppress_overscan) ? (overscan_y >> 1) : 0;
x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
for (x = 0; x < 64 - svga->hwcursor_latch.xoff; x += 4) for (x = 0; x < 64 - svga->hwcursor_latch.xoff; x += 4)
{ {
dat = svga->vram[svga->hwcursor_latch.addr + (offset >> 2)]; dat = svga->vram[svga->hwcursor_latch.addr + (offset >> 2)];

9
src/video/vid_s3.c
View File

@@ -8,7 +8,7 @@
* *
* S3 emulation. * S3 emulation.
* *
* Version: @(#)vid_s3.c 1.0.10 2018/04/26 * Version: @(#)vid_s3.c 1.0.11 2018/07/16
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -2461,10 +2461,11 @@ void s3_hwcursor_draw(svga_t *svga, int displine)
uint16_t dat[2]; uint16_t dat[2];
int xx; int xx;
int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff; int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
int y_add = (enable_overscan && !suppress_overscan) ? 16 : 0; int y_add, x_add;
int x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
uint32_t fg = 0, bg = 0; uint32_t fg = 0, bg = 0;
y_add = (enable_overscan && !suppress_overscan) ? (overscan_y >> 1) : 0;
x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
switch (svga->bpp) switch (svga->bpp)
{ {

8
src/video/vid_s3_virge.c
View File

@@ -8,7 +8,7 @@
* *
* S3 ViRGE emulation. * S3 ViRGE emulation.
* *
* Version: @(#)vid_s3_virge.c 1.0.11 2018/04/29 * Version: @(#)vid_s3_virge.c 1.0.12 2018/07/16
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -3377,9 +3377,11 @@ static void s3_virge_hwcursor_draw(svga_t *svga, int displine)
uint16_t dat[2]; uint16_t dat[2];
int xx; int xx;
int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff; int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
int y_add, x_add;
uint32_t fg, bg; uint32_t fg, bg;
int y_add = (enable_overscan && !suppress_overscan) ? 16 : 0;
int x_add = (enable_overscan && !suppress_overscan) ? 8 : 0; y_add = (enable_overscan && !suppress_overscan) ? (overscan_y >> 1) : 0;
x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
if (svga->interlace && svga->hwcursor_oddeven) if (svga->interlace && svga->hwcursor_oddeven)
svga->hwcursor_latch.addr += 16; svga->hwcursor_latch.addr += 16;

10
src/video/vid_tgui9440.c
View File

@@ -47,7 +47,7 @@
* access size or host data has any affect, but the Windows 3.1 * access size or host data has any affect, but the Windows 3.1
* driver always reads bytes and write words of 0xffff. * driver always reads bytes and write words of 0xffff.
* *
* Version: @(#)vid_tgui9440.c 1.0.6 2018/04/26 * Version: @(#)vid_tgui9440.c 1.0.7 2018/07/16
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -686,6 +686,10 @@ void tgui_hwcursor_draw(svga_t *svga, int displine)
uint32_t dat[2]; uint32_t dat[2];
int xx; int xx;
int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff; int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
int y_add, x_add;
y_add = (enable_overscan && !suppress_overscan) ? (overscan_y >> 1) : 0;
x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
if (svga->interlace && svga->hwcursor_oddeven) if (svga->interlace && svga->hwcursor_oddeven)
svga->hwcursor_latch.addr += 8; svga->hwcursor_latch.addr += 8;
@@ -697,9 +701,9 @@ void tgui_hwcursor_draw(svga_t *svga, int displine)
if (offset >= svga->hwcursor_latch.x) if (offset >= svga->hwcursor_latch.x)
{ {
if (!(dat[0] & 0x80000000)) if (!(dat[0] & 0x80000000))
((uint32_t *)buffer32->line[displine])[offset + 32] = (dat[1] & 0x80000000) ? 0xffffff : 0; ((uint32_t *)buffer32->line[displine + y_add])[offset + 32 + x_add] = (dat[1] & 0x80000000) ? 0xffffff : 0;
else if (dat[1] & 0x80000000) else if (dat[1] & 0x80000000)
((uint32_t *)buffer32->line[displine])[offset + 32] ^= 0xffffff; ((uint32_t *)buffer32->line[displine + y_add])[offset + 32 + x_add] ^= 0xffffff;
} }
offset++; offset++;