X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdos%2Fgfx.c;h=1f9b7270f66b72638646a5a910e428a662d26c0f;hp=5252cbcf4862accdd27955ce17048e2d8e265c7a;hb=93f68e445b0a4f10f2b15383aafed8a216a4a228;hpb=1329933c9afad7e3d0a7ce1f9839910706672f00 diff --git a/src/dos/gfx.c b/src/dos/gfx.c index 5252cbc..1f9b727 100644 --- a/src/dos/gfx.c +++ b/src/dos/gfx.c @@ -1,34 +1,54 @@ #include +#include #include +#include "demo.h" +#include "cdpmi.h" #include "gfx.h" #include "vbe.h" #include "vga.h" -#include "cdpmi.h" +#include "util.h" + +#define SAME_BPP(a, b) \ + ((a) == (b) || ((a) == 16 && (b) == 15) || ((a) == 15 && (b) == 16) || \ + ((a) == 32 && (b) == 24) || ((a) == 24 && (b) == 32)) -#define SAME_BPP(a, b) \ - ((a) == (b) || ((a) == 16 && (b) == 15) || ((a) == 15 && (b) == 16) || \ - ((a) == 32 && (b) == 24) || ((a) == 24 && (b) == 32)) +void (*blit_frame)(void*, int); + +static void blit_frame_lfb(void *pixels, int vsync); +static void blit_frame_banked(void *pixels, int vsync); +static uint32_t calc_mask(int sz, int pos); + +static struct video_mode *vmodes; +static int num_vmodes; static int vbe_init_ver; static struct vbe_info vbe; -static int mode, pgsize, fbsize; -static struct vbe_mode_info mode_info; +/* current mode */ +static struct video_mode *curmode; static void *vpgaddr[2]; -static int fbidx; -static int pgcount; +static int frontidx, backidx; +static int pgcount, pgsize, fbsize; + -static int init_vbe(void) +int init_video(void) { - int i, num; + int i, num, max_modes; + struct video_mode *vmptr; if(vbe_info(&vbe) == -1) { fprintf(stderr, "failed to retrieve VBE information\n"); return -1; } - vbe_print_info(stdout, &vbe); + num_vmodes = 0; + max_modes = 64; + if(!(vmodes = malloc(max_modes * sizeof *vmodes))) { + fprintf(stderr, "failed to allocate video modes list\n"); + return -1; + } + num = vbe_num_modes(&vbe); for(i=0; i= max_modes) { + int newmax = max_modes ? (max_modes << 1) : 16; + if(!(vmptr = realloc(vmodes, newmax * sizeof *vmodes))) { + fprintf(stderr, "failed to grow video mode list (%d)\n", newmax); + free(vmodes); + return -1; + } + vmodes = vmptr; + max_modes = newmax; + } + + vmptr = vmodes + num_vmodes++; + memset(vmptr, 0, sizeof *vmptr); + vmptr->mode = vbe.modes[i]; + vmptr->xsz = minf.xres; + vmptr->ysz = minf.yres; + vmptr->bpp = minf.bpp; + vmptr->pitch = minf.scanline_bytes; + if(minf.mem_model == VBE_TYPE_DIRECT) { + vmptr->rbits = minf.rsize; + vmptr->gbits = minf.gsize; + vmptr->bbits = minf.bsize; + vmptr->rshift = minf.rpos; + vmptr->gshift = minf.gpos; + vmptr->bshift = minf.bpos; + vmptr->rmask = calc_mask(minf.rsize, minf.rpos); + vmptr->gmask = calc_mask(minf.gsize, minf.gpos); + vmptr->bmask = calc_mask(minf.bsize, minf.bpos); + vmptr->bpp = vmptr->rbits + vmptr->gbits + vmptr->bbits; + } + if(minf.attr & VBE_ATTR_LFB) { + vmptr->fb_addr = minf.fb_addr; + } else { + vmptr->bank_size = (uint32_t)minf.bank_size * 1024; + if(!vmptr->bank_size) { + vmptr->bank_size = 65536; + } + } + vmptr->max_pages = minf.num_img_pages; + printf("%04x: ", vbe.modes[i]); vbe_print_mode_info(stdout, &minf); } @@ -45,73 +106,134 @@ static int init_vbe(void) return 0; } -void *set_video_mode(int xsz, int ysz, int bpp, int nbuf) +void cleanup_video(void) { - int i, nmodes; - int best_match_mode = -1; - struct vbe_mode_info minf; + free(vmodes); +} - if(!vbe_init_ver) { - if(init_vbe() == -1) { - fprintf(stderr, "failed to initialize VBE\n"); - return 0; - } - if(vbe_init_ver < 2) { - fprintf(stderr, "VBE >= 2.0 required\n"); - return 0; - } +struct video_mode *video_modes(void) +{ + return vmodes; +} + +int num_video_modes(void) +{ + return num_vmodes; +} + +struct video_mode *get_video_mode(int idx) +{ + if(idx == VMODE_CURRENT) { + return curmode; } + return vmodes + idx; +} - mode = -1; - nmodes = vbe_num_modes(&vbe); - for(i=0; ixsz != xsz || vm->ysz != ysz) continue; + if(SAME_BPP(vm->bpp, bpp)) { + best = i; } + if(vm->bpp == bpp) break; + } + + if(best == -1) { + fprintf(stderr, "failed to find video mode %dx%d %d bpp)\n", xsz, ysz, bpp); + return -1; } + return best; +} + +int find_video_mode(int mode) +{ + int i; + struct video_mode *vm; - if(mode == -1) { - if(best_match_mode == -1) { - fprintf(stderr, "failed to find requested video mode (%dx%d %d bpp)\n", xsz, ysz, bpp); + vm = vmodes; + for(i=0; imode == mode) return i; + } + return -1; +} + +void *set_video_mode(int idx, int nbuf) +{ + unsigned int mode; + struct video_mode *vm = vmodes + idx; + + if(curmode == vm) return vpgaddr[0]; + + printf("setting video mode %x (%dx%d %d bpp)\n", (unsigned int)vm->mode, + vm->xsz, vm->ysz, vm->bpp); + fflush(stdout); + + mode = vm->mode | VBE_MODE_LFB; + if(vbe_setmode(mode) == -1) { + mode = vm->mode; + if(vbe_setmode(mode) == -1) { + fprintf(stderr, "failed to set video mode %x\n", (unsigned int)vm->mode); return 0; } - mode = best_match_mode; + printf("Warning: failed to get a linear framebuffer. falling back to banked mode\n"); } - vbe_mode_info(mode, &mode_info); - printf("setting video mode %x: (%dx%d %d)\n", (unsigned int)mode, mode_info.xres, - mode_info.yres, mode_info.bpp); - - if(vbe_setmode(mode | VBE_MODE_LFB) == -1) { - fprintf(stderr, "failed to set video mode\n"); - return 0; + /* unmap previous video memory mapping, if there was one (switching modes) */ + if(vpgaddr[0] && vpgaddr[0] != (void*)0xa0000) { + dpmi_munmap(vpgaddr[0]); + vpgaddr[0] = vpgaddr[1] = 0; } + curmode = vm; if(nbuf < 1) nbuf = 1; if(nbuf > 2) nbuf = 2; - pgcount = nbuf > mode_info.num_img_pages ? mode_info.num_img_pages : nbuf; - - pgsize = mode_info.xres * mode_info.yres * (bpp / 8); + pgcount = nbuf > vm->max_pages ? vm->max_pages : nbuf; + pgsize = vm->ysz * vm->pitch; fbsize = pgcount * pgsize; - vpgaddr[0] = (void*)dpmi_mmap(mode_info.fb_addr, fbsize); - memset(vpgaddr[0], 0xaa, fbsize); + printf("pgcount: %d, pgsize: %d, fbsize: %d\n", pgcount, pgsize, fbsize); + printf("phys addr: %p\n", (void*)vm->fb_addr); + fflush(stdout); + + if(vm->fb_addr) { + vpgaddr[0] = (void*)dpmi_mmap(vm->fb_addr, fbsize); + if(!vpgaddr[0]) { + fprintf(stderr, "failed to map framebuffer (phys: %lx, size: %d)\n", + (unsigned long)vm->fb_addr, fbsize); + set_text_mode(); + return 0; + } + memset(vpgaddr[0], 0xaa, pgsize); + + if(pgcount > 1) { + vpgaddr[1] = (char*)vpgaddr[0] + pgsize; + backidx = 1; + page_flip(FLIP_NOW); /* start with the second page visible */ + } else { + frontidx = backidx = 0; + vpgaddr[1] = 0; + } + + blit_frame = blit_frame_lfb; - if(pgcount > 1) { - vpgaddr[1] = (char*)vpgaddr[0] + pgsize; - fbidx = 1; - page_flip(FLIP_NOW); /* start with the second page visible */ } else { - fbidx = 0; + vpgaddr[0] = (void*)0xa0000; vpgaddr[1] = 0; + + blit_frame = blit_frame_banked; + } + + /* allocate main memory framebuffer */ + if(resizefb(vm->xsz, vm->ysz, vm->bpp) == -1) { + fprintf(stderr, "failed to allocate %dx%d (%d bpp) framebuffer\n", vm->xsz, + vm->ysz, vm->bpp); + set_text_mode(); + return 0; } return vpgaddr[0]; @@ -119,7 +241,14 @@ void *set_video_mode(int xsz, int ysz, int bpp, int nbuf) int set_text_mode(void) { + /* unmap previous video memory mapping, if there was one (switching modes) */ + if(vpgaddr[0] && vpgaddr[0] != (void*)0xa0000) { + dpmi_munmap(vpgaddr[0]); + vpgaddr[0] = vpgaddr[1] = 0; + } + vga_setmode(3); + curmode = 0; return 0; } @@ -130,8 +259,52 @@ void *page_flip(int vsync) return vpgaddr[0]; } - vbe_swap(fbidx ? pgsize : 0, vsync ? VBE_SWAP_VBLANK : VBE_SWAP_NOW); - fbidx = (fbidx + 1) & 1; + vbe_swap(backidx ? pgsize : 0, vsync ? VBE_SWAP_VBLANK : VBE_SWAP_NOW); + frontidx = backidx; + backidx = (backidx + 1) & 1; + + return vpgaddr[backidx]; +} + + +static void blit_frame_lfb(void *pixels, int vsync) +{ + if(show_fps) dbg_fps(pixels); + if(vsync) wait_vsync(); + memcpy64(vpgaddr[frontidx], pixels, pgsize >> 3); +} + +static void blit_frame_banked(void *pixels, int vsync) +{ + int i, sz, offs; + unsigned int pending; + unsigned char *pptr = pixels; + + if(show_fps) dbg_fps(pixels); + + if(vsync) wait_vsync(); + + /* assume initial window offset at 0 */ + offs = 0; + pending = pgsize; + while(pending > 0) { + sz = pending > curmode->bank_size ? curmode->bank_size : pending; + //memcpy64((void*)0xa0000, pptr, sz >> 3); + memcpy((void*)0xa0000, pptr, sz); + pptr += sz; + pending -= sz; + vbe_setwin(0, ++offs); + } + + vbe_setwin(0, 0); +} - return vpgaddr[fbidx]; +static uint32_t calc_mask(int sz, int pos) +{ + int i; + uint32_t mask = 0; + while(sz-- > 0) { + mask = (mask << 1) | 1; + } + return mask << pos; }