cadcdev-svn-commits Mailing List for Cryptic Allusion DCDev

Revision: 647
 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=647&view=rev
Author: ljsebald
Date: 2009年08月03日 00:38:45 +0000 (2009年8月03日)
Log Message:
-----------
Support for multiple framebuffers when the PVR isn't being used.
Modified Paths:
--------------
 kos/kernel/arch/dreamcast/hardware/video.c
 kos/kernel/arch/dreamcast/include/dc/video.h
Modified: kos/kernel/arch/dreamcast/hardware/video.c
===================================================================
--- kos/kernel/arch/dreamcast/hardware/video.c	2009年06月12日 02:40:54 UTC (rev 646)
+++ kos/kernel/arch/dreamcast/hardware/video.c	2009年08月03日 00:38:45 UTC (rev 647)
@@ -11,6 +11,8 @@
 #include <string.h>
 #include <stdio.h>
 
+#define FBPOS(n) (n * 0x200000)
+
 /*-----------------------------------------------------------------------------*/
 /* This table is indexed w/ DM_* */
 vid_mode_t vid_builtin[DM_MODE_COUNT] = {
@@ -205,6 +207,198 @@
 		{ 0, 0, 0, 0 }
 	},
 
+	/* All of the modes below this comment are exactly the same as the ones
+	 above, other than that they support multiple framebuffers (in the current
+	 case, 4). They're only particularly useful if you're doing a drawing by
+	 directly writing to the framebuffer, and are not useful at all if you're
+	 using the PVR to do your drawing. */
+	/* 320x240 VGA 60Hz */
+	/* DM_320x240_VGA_MB */
+	{
+		DM_320x240 | DM_MULTIBUFFER,
+		320, 240,
+		VID_PIXELDOUBLE|VID_LINEDOUBLE,
+		CT_VGA,
+		0,
+		262, 857,
+		0xAC, 0x28,
+		0x15, 0x104,
+		141, 843,
+		24, 263,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 320x240 NTSC 60Hz */
+	/* DM_320x240_NTSC_MB */
+	{
+		DM_320x240 | DM_MULTIBUFFER,
+		320, 240,
+		VID_PIXELDOUBLE|VID_LINEDOUBLE,
+		CT_ANY,
+		0,
+		262, 857,
+		0xA4, 0x18,
+		0x15, 0x104,
+		141, 843,
+		24, 263,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 640x480 VGA 60Hz */
+	/* DM_640x480_VGA_MB */
+	{
+		DM_640x480 | DM_MULTIBUFFER,
+		640, 480,
+		VID_INTERLACE,
+		CT_VGA,
+		0,
+		0x20C, 0x359,
+		0xAC, 0x28,
+		0x15, 0x104,
+		0x7E, 0x345,
+		0x24, 0x204,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 640x480 NTSC 60Hz IL */
+	/* DM_640x480_NTSC_IL_MB */
+	{
+		DM_640x480 | DM_MULTIBUFFER,
+		640, 480,
+		VID_INTERLACE,
+		CT_ANY,
+		0,
+		0x20C, 0x359,
+		0xA4, 0x12,
+		0x15, 0x104,
+		0x7E, 0x345,
+		0x24, 0x204,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 800x608 NTSC 60Hz (VGA) [BROKEN!] */
+	/* DM_800x608_VGA_MB */
+	{
+		DM_800x608 | DM_MULTIBUFFER,
+		320, 240,
+		VID_INTERLACE,
+		1/*CT_ANY*/, /* This will block the mode from being set. */
+		0,
+		262, 857,
+		164, 24,
+		21, 82,
+		141, 843,
+		24, 264,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 640x480 PAL 50Hz IL */
+	/* DM_640x480_PAL_IL_MB */
+	{
+		DM_640x480 | DM_MULTIBUFFER,
+		640, 480,
+		VID_INTERLACE|VID_PAL,
+		CT_ANY,
+		0,
+		0x270, 0x35F,
+		0xAE, 0x2D,
+		0x15, 0x104,
+		0x8D, 0x34B,
+		0x2C, 0x26C,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 256x256 PAL 50Hz IL (seems to output the same w/o VID_PAL, ie. in NTSC IL mode) */
+	/* DM_256x256_PAL_IL_MB */
+	{
+		DM_256x256 | DM_MULTIBUFFER,
+		256, 256,
+		VID_PIXELDOUBLE|VID_LINEDOUBLE|VID_INTERLACE|VID_PAL,
+		CT_ANY,
+		0,
+		624, 863,
+		226, 37,
+		0x15, 0x104,
+		0x8D, 0x34B,
+		0x2C, 0x26C,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 768x480 NTSC 60Hz IL (thanks DCGrendel) */
+	/* DM_768x480_NTSC_IL_MB */
+	{
+		DM_768x480 | DM_MULTIBUFFER,
+		768, 480,
+		VID_INTERLACE,
+		CT_ANY,
+		0,
+		524, 857,
+		96, 18,
+		0x15, 0x104,
+		0x2e, 0x345,
+		0x24, 0x204,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 768x576 PAL 50Hz IL (DCG) */
+	/* DM_768x576_PAL_IL_MB */
+	{
+		DM_768x576 | DM_MULTIBUFFER,
+		768, 576,
+		VID_INTERLACE | VID_PAL,
+		CT_ANY,
+		0,
+		624, 863,
+		88, 16,
+		0x18, 0x104,
+		0x36, 0x34b,
+		0x2c, 0x26c,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 768x480 PAL 50Hz IL */
+	/* DM_768x480_PAL_IL_MB */
+	{
+		DM_768x480 | DM_MULTIBUFFER,
+		768, 480,
+		VID_INTERLACE | VID_PAL,
+		CT_ANY,
+		0,
+		624, 863,
+		88, 16,
+		0x18, 0x104,
+		0x36, 0x34b,
+		0x2c, 0x26c,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
+	/* 320x240 PAL 50Hz (thanks Marco Martins aka Mekanaizer) */
+	/* DM_320x240_PAL_MB */
+	{
+		DM_320x240 | DM_MULTIBUFFER,
+		320, 240,
+		VID_PIXELDOUBLE|VID_LINEDOUBLE|VID_PAL,
+		CT_ANY,
+		0,
+		312, 863,
+		174, 45,
+		21, 260,
+		141, 843,
+		44, 620,
+		0, VID_MAX_FB,
+		{ FBPOS(0), FBPOS(1), FBPOS(2), FBPOS(3) }
+	},
+
 	/* END */
 	/* DM_SENTINEL */
 	{ 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, { 0, 0, 0, 0 } }
@@ -244,10 +438,15 @@
 /*-----------------------------------------------------------------------------*/
 void vid_set_mode(int dm, int pm) {
 	vid_mode_t mode;
-	int i, ct, found;
+	int i, ct, found, dm2;
 
 	ct = vid_check_cable();
 
+	/* Remove the multi-buffering flag from the mode, if its present, and save
+	 the state of that flag. */
+	dm2 = dm & DM_MULTIBUFFER;
+	dm &= ~DM_MULTIBUFFER;
+
 	/* Check to see if we should use a direct mode index, a generic
 	 mode check, or if it's just invalid. */
 	if (dm > DM_INVALID && dm < DM_SENTINEL) {
@@ -256,7 +455,7 @@
 		found = 0;
 		for (i=1; i<DM_SENTINEL; i++) {
 			/* Is it the right generic mode? */
-			if (vid_builtin[i].generic != dm)
+			if (vid_builtin[i].generic != (dm | dm2))
 				continue;
 
 			/* Do we have the right cable type? */
@@ -318,9 +517,10 @@
 			mode->scanlines *= 2;
 	}
 
-	dbglog(DBG_INFO, "vid_set_mode: %ix%i%s %s\n", mode->width, mode->height,
+	dbglog(DBG_INFO, "vid_set_mode: %ix%i%s %s%s\n", mode->width, mode->height,
 		(mode->flags & VID_INTERLACE) ? "IL" : "",
-		(mode->flags & VID_PAL) ? "PAL" : "NTSC");
+		(mode->flags & VID_PAL) ? "PAL" : "NTSC",
+		(mode->generic & DM_MULTIBUFFER) ? " multi-buffered" : "");
 	
 	vid_border_color(0, 0, 0);
 	
@@ -392,7 +592,9 @@
 	memcpy(&currmode, mode, sizeof(vid_mode_t));
 	vid_mode = &currmode;
 	
-	vid_set_start(0);
+	/* Set up the framebuffer */
+	vid_mode->fb_curr = -1;
+	vid_flip(0);
 
 	/* Set cable type */
 	if (mode->cable_type & 1) {
@@ -427,6 +629,7 @@
 /*-----------------------------------------------------------------------------*/
 void vid_flip(int fb) {
 	uint16 oldfb;
+	uint32 base;
 
 	oldfb = vid_mode->fb_curr;
 	if (fb < 0) {
@@ -441,6 +644,11 @@
 	}
 
 	vid_set_start(vid_mode->fb_base[vid_mode->fb_curr]);
+
+	/* Set the vram_* pointers as expected */
+	base = vid_mode->fb_base[(vid_mode->fb_curr + 1) & (vid_mode->fb_count - 1)];
+	vram_s = (uint16*)(0xA5000000|base);
+	vram_l = (uint32*)(0xA5000000|base);
 }
 
 /*-----------------------------------------------------------------------------*/
Modified: kos/kernel/arch/dreamcast/include/dc/video.h
===================================================================
--- kos/kernel/arch/dreamcast/include/dc/video.h	2009年06月12日 02:40:54 UTC (rev 646)
+++ kos/kernel/arch/dreamcast/include/dc/video.h	2009年08月03日 00:38:45 UTC (rev 647)
@@ -38,6 +38,9 @@
 	DM_GENERIC_LAST = DM_768x576
 };
 
+// OR this with the generic mode to get 4 framebuffers instead of one
+#define DM_MULTIBUFFER	0x2000
+
 //-----------------------------------------------------------------------------
 // More specific modes (and actual indeces into the mode table)
 
@@ -55,6 +58,17 @@
 	DM_768x576_PAL_IL,
 	DM_768x480_PAL_IL,
 	DM_320x240_PAL,
+	DM_320x240_VGA_MB,
+	DM_320x240_NTSC_MB,
+	DM_640x480_VGA_MB,
+	DM_640x480_NTSC_IL_MB,
+	DM_800x608_VGA_MB,
+	DM_640x480_PAL_IL_MB,
+	DM_256x256_PAL_IL_MB,
+	DM_768x480_NTSC_IL_MB,
+	DM_768x576_PAL_IL_MB,
+	DM_768x480_PAL_IL_MB,
+	DM_320x240_PAL_MB,
 	// The below is only for counting..
 	DM_SENTINEL,
 	DM_MODE_COUNT
@@ -95,6 +109,12 @@
 extern vid_mode_t *vid_mode;
 
 //-----------------------------------------------------------------------------
+// These point to the current drawing area. If you're not using a multi-buffered
+// mode, that means they do what KOS always used to do (they'll point at the
+// start of VRAM). If you're using a multi-buffered mode, they'll point at the
+// next framebuffer to be displayed. You must use vid_flip for this to work
+// though (if you use vid_set_start, they'll point at the display base, for
+// compatibility's sake).
 extern uint16 *vram_s;
 extern uint32 *vram_l;
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.