Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ViRGE hardware cursor now supports X11 format cursors, and uses colour registers.

Browse source
This commit is contained in:
TomW 2014-09-20 18:00:54 +01:00
commit c1ca4ec29e
1 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/vid_s3_virge.c
View file

@ -105,6 +105,9 @@ typedef struct virge_t
event_t *wake_render_thread; event_t *wake_render_thread;
event_t *wake_main_thread; event_t *wake_main_thread;
event_t *not_full_event; event_t *not_full_event;
uint32_t hwcursor_col[2];
int hwcursor_col_pos;
struct struct
{ {
@ -339,6 +342,19 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
svga->hwcursor.yoff = svga->crtc[0x4f] & 63; svga->hwcursor.yoff = svga->crtc[0x4f] & 63;
svga->hwcursor.addr = ((((svga->crtc[0x4c] << 8) | svga->crtc[0x4d]) & 0xfff) * 1024) + (svga->hwcursor.yoff * 16); svga->hwcursor.addr = ((((svga->crtc[0x4c] << 8) | svga->crtc[0x4d]) & 0xfff) * 1024) + (svga->hwcursor.yoff * 16);
break; break;
case 0x4a:
virge->hwcursor_col[1] = (virge->hwcursor_col[1] & ~(0xff << (virge->hwcursor_col_pos * 8))) |
(val << (virge->hwcursor_col_pos * 8));
virge->hwcursor_col_pos++;
virge->hwcursor_col_pos &= 3;
break;
case 0x4b:
virge->hwcursor_col[0] = (virge->hwcursor_col[0] & ~(0xff << (virge->hwcursor_col_pos * 8))) |
(val << (virge->hwcursor_col_pos * 8));
virge->hwcursor_col_pos++;
virge->hwcursor_col_pos &= 3;
break;
case 0x53: case 0x53:
case 0x58: case 0x59: case 0x5a: case 0x58: case 0x59: case 0x5a:
@ -416,6 +432,7 @@ static uint8_t s3_virge_in(uint16_t addr, void *p)
case 0x31: ret = (svga->crtc[0x31] & 0xcf) | ((virge->ma_ext & 3) << 4); break; case 0x31: ret = (svga->crtc[0x31] & 0xcf) | ((virge->ma_ext & 3) << 4); break;
case 0x35: ret = (svga->crtc[0x35] & 0xf0) | (virge->bank & 0xf); break; case 0x35: ret = (svga->crtc[0x35] & 0xf0) | (virge->bank & 0xf); break;
case 0x36: ret = (svga->crtc[0x36] & 0xfc) | 2; break; /*PCI bus*/ case 0x36: ret = (svga->crtc[0x36] & 0xfc) | 2; break; /*PCI bus*/
case 0x45: virge->hwcursor_col_pos = 0; ret = svga->crtc[0x45]; break;
case 0x51: ret = (svga->crtc[0x51] & 0xf0) | ((virge->bank >> 2) & 0xc) | ((virge->ma_ext >> 2) & 3); break; case 0x51: ret = (svga->crtc[0x51] & 0xf0) | ((virge->bank >> 2) & 0xc) | ((virge->ma_ext >> 2) & 3); break;
case 0x69: ret = virge->ma_ext; break; case 0x69: ret = virge->ma_ext; break;
case 0x6a: ret = virge->bank; break; case 0x6a: ret = virge->bank; break;
@ -2729,6 +2746,7 @@ static void queue_triangle(virge_t *virge)
static void s3_virge_hwcursor_draw(svga_t *svga, int displine) static void s3_virge_hwcursor_draw(svga_t *svga, int displine)
{ {
virge_t *virge = (virge_t *)svga->p;
int x; int x;
uint16_t dat[2]; uint16_t dat[2];
int xx; int xx;
@ -2739,20 +2757,40 @@ static void s3_virge_hwcursor_draw(svga_t *svga, int displine)
{ {
dat[0] = (svga->vram[svga->hwcursor_latch.addr] << 8) | svga->vram[svga->hwcursor_latch.addr + 1]; dat[0] = (svga->vram[svga->hwcursor_latch.addr] << 8) | svga->vram[svga->hwcursor_latch.addr + 1];
dat[1] = (svga->vram[svga->hwcursor_latch.addr + 2] << 8) | svga->vram[svga->hwcursor_latch.addr + 3]; dat[1] = (svga->vram[svga->hwcursor_latch.addr + 2] << 8) | svga->vram[svga->hwcursor_latch.addr + 3];
for (xx = 0; xx < 16; xx++) if (svga->crtc[0x55] & 0x10)
{ {
if (offset >= svga->hwcursor_latch.x) /*X11*/
for (xx = 0; xx < 16; xx++)
{ {
if (!(dat[0] & 0x8000)) if (offset >= svga->hwcursor_latch.x)
((uint32_t *)buffer32->line[displine])[offset + 32] = (dat[1] & 0x8000) ? 0xffffff : 0; {
else if (dat[1] & 0x8000) if (dat[0] & 0x8000)
((uint32_t *)buffer32->line[displine])[offset + 32] ^= 0xffffff; ((uint32_t *)buffer32->line[displine])[offset + 32] = virge->hwcursor_col[dat[1] >> 15];
// pclog("Plot %i, %i (%i %i) %04X %04X\n", offset, displine, x+xx, svga->hwcursor_on, dat[0], dat[1]); }
}
offset++; offset++;
dat[0] <<= 1; dat[0] <<= 1;
dat[1] <<= 1; dat[1] <<= 1;
}
}
else
{
/*Windows*/
for (xx = 0; xx < 16; xx++)
{
if (offset >= svga->hwcursor_latch.x)
{
if (!(dat[0] & 0x8000))
((uint32_t *)buffer32->line[displine])[offset + 32] = virge->hwcursor_col[dat[1] >> 15];
else if (dat[1] & 0x8000)
((uint32_t *)buffer32->line[displine])[offset + 32] ^= 0xffffff;
// pclog("Plot %i, %i (%i %i) %04X %04X\n", offset, displine, x+xx, svga->hwcursor_on, dat[0], dat[1]);
}
offset++;
dat[0] <<= 1;
dat[1] <<= 1;
}
} }
svga->hwcursor_latch.addr += 4; svga->hwcursor_latch.addr += 4;
} }