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

Merge pull request #1102 from 86Box/tc1995

Browse Source 
Tc1995
This commit is contained in:
Miran Grča
2020-11-18 22:04:28 +01:00
committed by GitHub
parent 31c78fddf3 9a2517c415
commit 6e94c0efaa
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/vid_voodoo.c
View File

@@ -139,7 +139,9 @@ void voodoo_recalc(voodoo_t *voodoo)
if (voodoo->fbiInit1 & (1 << 24)) if (voodoo->fbiInit1 & (1 << 24))
voodoo->block_width += 32; voodoo->block_width += 32;
voodoo->row_width = voodoo->block_width * 32 * 2; voodoo->row_width = voodoo->block_width * 32 * 2;
voodoo->params.row_width = voodoo->row_width;
voodoo->aux_row_width = voodoo->row_width; voodoo->aux_row_width = voodoo->row_width;
voodoo->params.aux_row_width = voodoo->aux_row_width;
} }

6
src/video/vid_voodoo_banshee.c
View File

@@ -1673,10 +1673,11 @@ void banshee_hwcursor_draw(svga_t *svga, int displine)
{ \ { \
int c; \ int c; \
int wp = 0; \ int wp = 0; \
uint32_t base_addr = buf ? src_addr2 : src_addr; \
\ \
for (c = 0; c < voodoo->overlay.overlay_bytes; c += 2) \ for (c = 0; c < voodoo->overlay.overlay_bytes; c += 2) \
{ \ { \
uint16_t data = *(uint16_t *)&src[(c & 127) + (c >> 7)*128*32]; \ uint16_t data = *(uint16_t *)&svga->vram[(base_addr + (c & 127) + (c >> 7)*128*32) & svga->vram_mask]; \
int r = data & 0x1f; \ int r = data & 0x1f; \
int g = (data >> 5) & 0x3f; \ int g = (data >> 5) & 0x3f; \
int b = data >> 11; \ int b = data >> 11; \
@@ -1972,7 +1973,8 @@ static void banshee_overlay_draw(svga_t *svga, int displine)
!(banshee->vidProcCfg & VIDPROCCFG_H_SCALE_ENABLE) && !(banshee->vidProcCfg & VIDPROCCFG_FILTER_MODE_DITHER_4X4) && !(banshee->vidProcCfg & VIDPROCCFG_H_SCALE_ENABLE) && !(banshee->vidProcCfg & VIDPROCCFG_FILTER_MODE_DITHER_4X4) &&
!(banshee->vidProcCfg & VIDPROCCFG_FILTER_MODE_DITHER_2X2)); !(banshee->vidProcCfg & VIDPROCCFG_FILTER_MODE_DITHER_2X2));
else else
skip_filtering = ((banshee->vidProcCfg & VIDPROCCFG_FILTER_MODE_MASK) != VIDPROCCFG_FILTER_MODE_BILINEAR); skip_filtering = ((banshee->vidProcCfg & VIDPROCCFG_FILTER_MODE_MASK) != VIDPROCCFG_FILTER_MODE_BILINEAR &&
!(banshee->vidProcCfg & VIDPROCCFG_H_SCALE_ENABLE));
if (skip_filtering) if (skip_filtering)
{ {