X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdos%2Fgfx.c;h=c2e4f8decd2f974b92cf0ddbbcfdb3ae1a3d2221;hb=a5c65ceb155188c8acee31a475f8db9f5b58f4b6;hp=558646b73001943f204731954e51db97afc27f11;hpb=8a64d603ee67cd98070360b40938e123ea845154;p=dosdemo

diff --git a/src/dos/gfx.c b/src/dos/gfx.c
index 558646b..c2e4f8d 100644
--- a/src/dos/gfx.c
+++ b/src/dos/gfx.c
@@ -6,16 +6,23 @@
 #include <string.h>
 #include <limits.h>
 #include "vbe.h"
-#include "dpmi.h"
-#include "logger.h"
+#include "cdpmi.h"
 
+#ifdef __DJGPP__
+#include <sys/nearptr.h>
+
+#define REALPTR(s, o)	(void*)(((uint32_t)(s) << 4) - __djgpp_base_address + (uint32_t)(o))
+#else
 #define REALPTR(s, o)	(void*)(((uint32_t)(s) << 4) + (uint32_t)(o))
+#endif
+
 #define VBEPTR(x)		REALPTR(((x) & 0xffff0000) >> 16, (x) & 0xffff)
 #define VBEPTR_SEG(x)	(((x) & 0xffff0000) >> 16)
 #define VBEPTR_OFF(x)	((x) & 0xffff)
 
 #define SAME_BPP(a, b)	\
-	((a) == (b) || (a) == 16 && (b) == 15 || (a) == 15 && (b) == 16 || (a) == 32 && (b) == 24 || (a) == 24 && (b) == 32)
+	((a) == (b) || ((a) == 16 && (b) == 15) || ((a) == 15 && (b) == 16) || \
+	 ((a) == 32 && (b) == 24) || ((a) == 24 && (b) == 32))
 
 static unsigned int make_mask(int sz, int pos);
 
@@ -26,9 +33,14 @@ static int pal_bits = 6;
 void *set_video_mode(int xsz, int ysz, int bpp)
 {
 	int i;
-	uint16_t *modes, best = 0;
+	static uint16_t *modes;
+	uint16_t best = 0;
 	unsigned int fbsize;
 
+#ifdef __DJGPP__
+	__djgpp_nearptr_enable();
+#endif
+
 	/* check for VBE2 support and output some info */
 	if(!vbe_info) {
 		if(!(vbe_info = vbe_get_info())) {
@@ -36,15 +48,15 @@ void *set_video_mode(int xsz, int ysz, int bpp)
 			return 0;
 		}
 
-		printlog("VBE Version: %x.%x\n", vbe_info->version >> 8, vbe_info->version & 0xff);
+		printf("VBE Version: %x.%x\n", vbe_info->version >> 8, vbe_info->version & 0xff);
 		if(vbe_info->version < 0x200) {
 			fprintf(stderr, "This program requires VBE 2.0 or greater. Try running UniVBE\n");
 			return 0;
 		}
 
-		printlog("Graphics adapter: %s, %s (%s)\n", VBEPTR(vbe_info->oem_vendor_name_ptr),
-				VBEPTR(vbe_info->oem_product_name_ptr), VBEPTR(vbe_info->oem_product_rev_ptr));
-		printlog("Video memory: %dkb\n", vbe_info->total_mem << 6);
+		printf("Graphics adapter: %s, %s (%s)\n", (char*)VBEPTR(vbe_info->oem_vendor_name_ptr),
+				(char*)VBEPTR(vbe_info->oem_product_name_ptr), (char*)VBEPTR(vbe_info->oem_product_rev_ptr));
+		printf("Video memory: %dkb\n", vbe_info->total_mem << 6);
 
 		modes = VBEPTR(vbe_info->vid_mode_ptr);
 	}
@@ -78,7 +90,7 @@ void *set_video_mode(int xsz, int ysz, int bpp)
 	/* attempt to set 8 bits of color per component in palettized modes */
 	/*if(bpp <= 8) {
 		pal_bits = vbe_set_palette_bits(8);
-		printlog("palette bits per color primary: %d\n", pal_bits);
+		printf("palette bits per color primary: %d\n", pal_bits);
 	}
 	*/
 
@@ -142,21 +154,6 @@ void set_palette(int idx, int r, int g, int b)
 	vbe_set_palette(idx, col, 1, pal_bits);
 }
 
-void wait_vsync(void)
-{
-	__asm {
-		mov dx, 0x3da
-	l1:
-		in al, dx
-		and al, 0x8
-		jnz l1
-	l2:
-		in al, dx
-		and al, 0x8
-		jz l2
-	}
-}
-
 static unsigned int make_mask(int sz, int pos)
 {
 	unsigned int i, mask = 0;