X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdos%2Fgfx.c;h=cde439e67e938663f392460a83c5ea179672db57;hb=ae47c13224ea63ac83f80ab332f7436b3265cdce;hp=b610f187b31ddcd78ca319151cba4a4d88df36ac;hpb=0cf749b80f7732e66fbb78815e3752985b845d17;p=eradicate

diff --git a/src/dos/gfx.c b/src/dos/gfx.c
index b610f18..cde439e 100644
--- a/src/dos/gfx.c
+++ b/src/dos/gfx.c
@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include "cdpmi.h"
 #include "gfx.h"
 #include "vbe.h"
 #include "vga.h"
@@ -8,6 +10,10 @@
 	((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;
@@ -19,9 +25,10 @@ static struct vbe_info vbe;
 /* current mode */
 static struct video_mode *curmode;
 static void *vpgaddr[2];
-static int fbidx;
+static int frontidx, backidx;
 static int pgcount, pgsize, fbsize;
 
+
 int init_video(void)
 {
 	int i, num, max_modes;
@@ -34,7 +41,7 @@ int init_video(void)
 	vbe_print_info(stdout, &vbe);
 
 	num_vmodes = 0;
-	max_modes = 4;	/* TODO change */
+	max_modes = 64;
 	if(!(vmodes = malloc(max_modes * sizeof *vmodes))) {
 		fprintf(stderr, "failed to allocate video modes list\n");
 		return -1;
@@ -76,8 +83,16 @@ int init_video(void)
 			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->fb_addr = minf.fb_addr;
 		vmptr->max_pages = minf.num_img_pages;
 
 		printf("%04x: ", vbe.modes[i]);
@@ -86,12 +101,6 @@ int init_video(void)
 	fflush(stdout);
 
 	vbe_init_ver = VBE_VER_MAJOR(vbe.ver);
-	if(vbe_init_ver < 2) {
-		fprintf(stderr, "VBE 2.0 required. Upgrade your video card or run univbe.\n");
-		free(vmodes);
-		vmodes = 0;
-		return -1;
-	}
 	return 0;
 }
 
@@ -166,31 +175,39 @@ void *set_video_mode(int idx, int nbuf)
 	if(nbuf < 1) nbuf = 1;
 	if(nbuf > 2) nbuf = 2;
 	pgcount = nbuf > vm->max_pages ? vm->max_pages : nbuf;
-	pgsize = (vm->xsz * vm->bpp / 8) * vm->ysz;
+	pgsize = vm->ysz * vm->pitch;
 	fbsize = pgcount * pgsize;
 
 	printf("pgcount: %d, pgsize: %d, fbsize: %d\n", pgcount, pgsize, fbsize);
 	printf("phys addr: %p\n", (void*)vm->fb_addr);
+	fflush(stdout);
 
-	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, fbsize);
+	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;
+		}
 
-	printf("vaddr: %p\n", vpgaddr[0]);
-	fflush(stdout);
+		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;
 	}
 	return vpgaddr[0];
 }
@@ -209,10 +226,40 @@ 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(vsync) wait_vsync();
+	memcpy(vpgaddr[frontidx], pixels, pgsize);
+}
+
+static void blit_frame_banked(void *pixels, int vsync)
+{
+	int i, sz, offs;
+	unsigned int pending;
+	unsigned char *pptr = 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;
+		memcpy((void*)0xa0000, pptr, sz);
+		pptr += sz;
+		pending -= sz;
+		vbe_setwin(0, ++offs);
+	}
 
-	return vpgaddr[fbidx];
+	vbe_setwin(0, 0);
 }
 
 static uint32_t calc_mask(int sz, int pos)