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

Fixed SVGA 15bpp and 16bpp low resolution renderers;

Browse Source 
IDE WIN_DRIVE_DIAGNOSTICS fix per patch by greatpsycho;
The two Laser XT boards now allow using up to 1152 kB RAM per report from greatpsycho.
This commit is contained in:
OBattler
2017-06-11 17:40:34 +02:00
parent cdd855d258
commit 760b4f89ae
4 changed files with 119 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/VIDEO/vid_svga_render.c
View File

@@ -691,22 +691,36 @@ void svga_render_15bpp_lowres(svga_t *svga)
int x;
int offset = (8 - (svga->scrollcache & 6)) + 24;
uint32_t *p = &((uint32_t *)buffer32->line[dl])[offset + x_add];
if (svga->firstline_draw == 2000)
svga->firstline_draw = svga->displine;
svga->lastline_draw = svga->displine;
for (x = 0; x <= svga->hdisp; x += 4)
for (x = 0; x <= svga->hdisp; x += 16)
{
uint32_t dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + (x << 1), svga)]);
uint32_t dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + x, svga)]);
p[x] = svga_color_transform(video_15to32[dat & 0xffff]);
p[x + 1] = svga_color_transform(video_15to32[dat >> 16]);
p[x + 1] = svga_color_transform(video_15to32[dat & 0xffff]);
p[x + 2] = svga_color_transform(video_15to32[dat >> 16]);
p[x + 3] = svga_color_transform(video_15to32[dat >> 16]);
dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + x + 4, svga)]);
p[x + 4] = svga_color_transform(video_15to32[dat & 0xffff]);
p[x + 5] = svga_color_transform(video_15to32[dat & 0xffff]);
p[x + 6] = svga_color_transform(video_15to32[dat >> 16]);
p[x + 7] = svga_color_transform(video_15to32[dat >> 16]);
dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + (x << 1) + 4, svga)]);
dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + x + 8, svga)]);
p[x + 8] = svga_color_transform(video_15to32[dat & 0xffff]);
p[x + 9] = svga_color_transform(video_15to32[dat & 0xffff]);
p[x + 10] = svga_color_transform(video_15to32[dat >> 16]);
p[x + 11] = svga_color_transform(video_15to32[dat >> 16]);
p[x] = svga_color_transform(video_15to32[dat & 0xffff]);
p[x + 1] = svga_color_transform(video_15to32[dat >> 16]);
dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + x + 12, svga)]);
p[x + 12] = svga_color_transform(video_15to32[dat & 0xffff]);
p[x + 13] = svga_color_transform(video_15to32[dat & 0xffff]);
p[x + 14] = svga_color_transform(video_15to32[dat >> 16]);
p[x + 15] = svga_color_transform(video_15to32[dat >> 16]);
}
svga->ma += x << 1;
svga->ma = svga_mask_addr(svga->ma, svga);
@@ -763,22 +777,36 @@ void svga_render_16bpp_lowres(svga_t *svga)
int x;
int offset = (8 - (svga->scrollcache & 6)) + 24;
uint32_t *p = &((uint32_t *)buffer32->line[dl])[offset + x_add];
if (svga->firstline_draw == 2000)
svga->firstline_draw = svga->displine;
svga->lastline_draw = svga->displine;
for (x = 0; x <= svga->hdisp; x += 4)
for (x = 0; x <= svga->hdisp; x += 16)
{
uint32_t dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + (x << 1), svga)]);
uint32_t dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + x, svga)]);
p[x] = svga_color_transform(video_16to32[dat & 0xffff]);
p[x + 1] = svga_color_transform(video_16to32[dat >> 16]);
p[x + 1] = svga_color_transform(video_16to32[dat & 0xffff]);
p[x + 2] = svga_color_transform(video_16to32[dat >> 16]);
p[x + 3] = svga_color_transform(video_16to32[dat >> 16]);
dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + x + 4, svga)]);
p[x + 4] = svga_color_transform(video_16to32[dat & 0xffff]);
p[x + 5] = svga_color_transform(video_16to32[dat & 0xffff]);
p[x + 6] = svga_color_transform(video_16to32[dat >> 16]);
p[x + 7] = svga_color_transform(video_16to32[dat >> 16]);
dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + (x << 1) + 4, svga)]);
dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + x + 8, svga)]);
p[x + 8] = svga_color_transform(video_16to32[dat & 0xffff]);
p[x + 9] = svga_color_transform(video_16to32[dat & 0xffff]);
p[x + 10] = svga_color_transform(video_16to32[dat >> 16]);
p[x + 11] = svga_color_transform(video_16to32[dat >> 16]);
p[x] = svga_color_transform(video_16to32[dat & 0xffff]);
p[x + 1] = svga_color_transform(video_16to32[dat >> 16]);
dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + x + 12, svga)]);
p[x + 12] = svga_color_transform(video_16to32[dat & 0xffff]);
p[x + 13] = svga_color_transform(video_16to32[dat & 0xffff]);
p[x + 14] = svga_color_transform(video_16to32[dat >> 16]);
p[x + 15] = svga_color_transform(video_16to32[dat >> 16]);
}
svga->ma += x << 1;
svga->ma = svga_mask_addr(svga->ma, svga);
@@ -940,6 +968,32 @@ void svga_render_32bpp_highres(svga_t *svga)
}
}
void svga_render_ABGR8888_lowres(svga_t *svga)
{
int y_add = (enable_overscan) ? 16 : 0;
int x_add = y_add >> 1;
int dl = svga_display_line(svga);
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[svga_mask_changedaddr((svga->ma >> 12) + 1, svga)] || svga->changedvram[svga_mask_changedaddr((svga->ma >> 12) + 2, svga)] || svga->fullchange)
{
int x;
int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
uint32_t *p = &((uint32_t *)buffer32->line[dl])[offset + x_add];
if (svga->firstline_draw == 2000)
svga->firstline_draw = svga->displine;
svga->lastline_draw = svga->displine;
for (x = 0; x <= svga->hdisp; x++)
{
uint32_t dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + (x << 2), svga)]);
p[x << 1] = p[(x << 1) + 1] = svga_color_transform(((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16));
}
svga->ma += 4;
svga->ma = svga_mask_addr(svga->ma, svga);
}
}
void svga_render_ABGR8888_highres(svga_t *svga)
{
int y_add = (enable_overscan) ? 16 : 0;
@@ -966,6 +1020,32 @@ void svga_render_ABGR8888_highres(svga_t *svga)
}
}
void svga_render_RGBA8888_lowres(svga_t *svga)
{
int y_add = (enable_overscan) ? 16 : 0;
int x_add = y_add >> 1;
int dl = svga_display_line(svga);
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[svga_mask_changedaddr((svga->ma >> 12) + 1, svga)] || svga->changedvram[svga_mask_changedaddr((svga->ma >> 12) + 2, svga)] || svga->fullchange)
{
int x;
int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
uint32_t *p = &((uint32_t *)buffer32->line[dl])[offset + x_add];
if (svga->firstline_draw == 2000)
svga->firstline_draw = svga->displine;
svga->lastline_draw = svga->displine;
for (x = 0; x <= svga->hdisp; x++)
{
uint32_t dat = *(uint32_t *)(&svga->vram[svga_mask_addr(svga->ma + (x << 2), svga)]);
p[x << 1] = p[(x << 1) + 1] = svga_color_transform(dat >> 8);
}
svga->ma += 4;
svga->ma = svga_mask_addr(svga->ma, svga);
}
}
void svga_render_RGBA8888_highres(svga_t *svga)
{
int y_add = (enable_overscan) ? 16 : 0;

2
src/VIDEO/vid_svga_render.h
View File

@@ -47,7 +47,9 @@ void svga_render_24bpp_lowres(svga_t *svga);
void svga_render_24bpp_highres(svga_t *svga);
void svga_render_32bpp_lowres(svga_t *svga);
void svga_render_32bpp_highres(svga_t *svga);
void svga_render_ABGR8888_lowres(svga_t *svga);
void svga_render_ABGR8888_highres(svga_t *svga);
void svga_render_RGBA8888_lowres(svga_t *svga);
void svga_render_RGBA8888_highres(svga_t *svga);
extern void (*svga_render)(svga_t *svga);