sdl-ios-xcode: src/video/svga/SDL_svgavideo.c comparison

comparison src/video/svga/SDL_svgavideo.c @ 1554:0ca607a5d173

Fixed bug #84 Date: Sun, 23 Oct 2005 16:39:03 +0200 From: "A. Schmid" <sahib@phreaker.net> Subject: [SDL] no software surfaces with svgalib driver? Hi, I noticed that the SDL (1.2.9) svgalib driver only makes use of linear addressable (framebuffer) video modes. On older systems (like one of mine), linear addressable modes are often not available. Especially for cards with VESA VBE < 2.0 the svgalib vesa driver is unusable, since VESA only supports framebuffering for VBE 2.0 and later. The changes necessary to add support for software surfaces seem to be relatively small. I only had to hack src/video/svga/SDL_svgavideo.c (see attached patch). The code worked fine for me, but it is no more than a proof of concept and should be reviewed (probably has a memory leak when switching modes). It also uses the vgagl library (included in the svgalib package) and needs to be linked against it. -Alex

author	Sam Lantinga <slouken@libsdl.org>
date	Sun, 19 Mar 2006 12:04:40 +0000
parents	8d9bb0cf2c2a
children	011b633fa0c9

comparison

equal deleted inserted replaced

-:63fa37538842
+:0ca607a5d173
 #error You must choose your operating system here
 #endif
 #include <vga.h>
 #include <vgamouse.h>
 #include <vgakeyboard.h>
+#include <vgagl.h>
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "../SDL_sysvideo.h"
 #include "../SDL_pixels_c.h"
 #include "../../events/SDL_events_c.h"
 #include "SDL_svgavideo.h"
 #include "SDL_svgaevents_c.h"
 #include "SDL_svgamouse_c.h"
+static GraphicsContext *realgc = NULL;
+static GraphicsContext *virtgc = NULL;
 /* Initialization/Query functions */
 static int SVGA_VideoInit(_THIS, SDL_PixelFormat *vformat);
 static SDL_Rect **SVGA_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags);
 static SDL_Surface *SVGA_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags);
 	modeinfo = vga_getmodeinfo(mode);
 	if ( force || ( modeinfo->flags & CAPABLE_LINEAR ) ) {
 		int i, j;
 		i = modeinfo->bytesperpixel-1;
+		if ( i < 0 ) {
+			return 0;
+		}
 		if ( actually_add ) {
 			SDL_Rect saved_rect[2];
 			int      saved_mode[2];
 			int b;
 static void SVGA_UpdateVideoInfo(_THIS)
 {
 	vga_modeinfo *modeinfo;
 	this->info.wm_available = 0;
-	this->info.hw_available = 1;
+	this->info.hw_available = (virtgc ? 0 : 1);
 	modeinfo = vga_getmodeinfo(vga_getcurrentmode());
 	this->info.video_mem = modeinfo->memory;
 	/* FIXME: Add hardware accelerated blit information */
 #ifdef SVGALIB_DEBUG
 	printf("Hardware accelerated blit: %savailable\n", modeinfo->haveblit ? "" : "not ");
 	/* Enumerate the available fullscreen modes */
 	total_modes = 0;
 	for ( mode=vga_lastmodenumber(); mode; --mode ) {
 		if ( vga_hasmode(mode) ) {
-			if ( SVGA_AddMode(this, mode, 0, 0) ) {
+			if ( SVGA_AddMode(this, mode, 0, 1) ) {
 				++total_modes;
 			}
 		}
 	}
 	if ( SVGA_AddMode(this, G320x200x256, 0, 1) ) ++total_modes;
 		}
 		SDL_modelist[i][j] = NULL;
 	}
 	for ( mode=vga_lastmodenumber(); mode; --mode ) {
 		if ( vga_hasmode(mode) ) {
-			SVGA_AddMode(this, mode, 1, 0);
+			SVGA_AddMode(this, mode, 1, 1);
 		}
 	}
 	SVGA_AddMode(this, G320x200x256, 1, 1);
 	/* Free extra (duplicated) modes */
 {
 	int mode;
 	int vgamode;
 	vga_modeinfo *modeinfo;
 	int screenpage_len;
+	/* Clean up old video mode data */
+	if ( realgc ) {
+		free(realgc);
+		realgc = NULL;
+	}
+	if ( virtgc ) {
+		/* FIXME: Why does this crash?
+		gl_freecontext(virtgc);*/
+		free(virtgc);
+		virtgc = NULL;
+	}
 	/* Try to set the requested linear video mode */
 	bpp = (bpp+7)/8-1;
 	for ( mode=0; SDL_modelist[bpp][mode]; ++mode ) {
 		if ( (SDL_modelist[bpp][mode]->w == width) &&
 	}
 	if ( SDL_modelist[bpp][mode] == NULL ) {
 		SDL_SetError("Couldn't find requested mode in list");
 		return(NULL);
 	}
-	vga_setmode(SDL_vgamode[bpp][mode]);
+	vgamode = SDL_vgamode[bpp][mode];
+	vga_setmode(vgamode);
 	vga_setpage(0);
-	vgamode=SDL_vgamode[bpp][mode];
+	if ( (vga_setlinearaddressing() < 0) && (vgamode != G320x200x256) ) {
-	if ((vga_setlinearaddressing()<0) && (vgamode!=G320x200x256)) {
+		gl_setcontextvga(vgamode);
-		SDL_SetError("Unable to set linear addressing");
+		realgc = gl_allocatecontext();
-		return(NULL);
+		gl_getcontext(realgc);
-	}
+		gl_setcontextvgavirtual(vgamode);
+		virtgc = gl_allocatecontext();
+		gl_getcontext(virtgc);
+		flags &= ~SDL_DOUBLEBUF;
+	}
 	modeinfo = vga_getmodeinfo(SDL_vgamode[bpp][mode]);
 	/* Update hardware acceleration info */
 	SVGA_UpdateVideoInfo(this);
 	if ( ! SDL_ReallocFormat(current, bpp, 0, 0, 0, 0) ) {
 		return(NULL);
 	}
 	/* Set up the new mode framebuffer */
-	current->flags = (SDL_FULLSCREEN|SDL_HWSURFACE);
+	current->flags = SDL_FULLSCREEN;
+	if ( virtgc ) {
+		current->flags |= SDL_SWSURFACE;
+	} else {
+		current->flags |= SDL_HWSURFACE;
+	}
 	if ( bpp == 8 ) {
 		/* FIXME: What about DirectColor? */
 		current->flags |= SDL_HWPALETTE;
 	}
 	current->w = width;
 	current->h = height;
 	current->pitch = modeinfo->linewidth;
-	current->pixels = vga_getgraphmem();
+	if ( virtgc ) {
+		current->pixels = virtgc->vbuf;
+	} else {
+		current->pixels = vga_getgraphmem();
+	}
 	/* set double-buffering */
 	if ( flags & SDL_DOUBLEBUF )
 	{
 	    /* length of one screen page in bytes */
 		SVGA_FlipHWSurface(this,current);
 	    }
 	}
 	/* Set the blit function */
-	this->UpdateRects = SVGA_DirectUpdate;
+	if ( virtgc ) {
+		this->UpdateRects = SVGA_BankedUpdate;
+	} else {
+		this->UpdateRects = SVGA_DirectUpdate;
+	}
 	/* Set up the mouse handler again (buggy SVGAlib 1.40) */
 	mouse_seteventhandler(SVGA_mousecallback);
 	/* We're done */
 	return;
 }
 static int SVGA_FlipHWSurface(_THIS, SDL_Surface *surface)
 {
-	vga_setdisplaystart(flip_offset[flip_page]);
+	if ( !virtgc ) {
-	flip_page=!flip_page;
+		vga_setdisplaystart(flip_offset[flip_page]);
-	surface->pixels=flip_address[flip_page];
+		flip_page=!flip_page;
-	vga_waitretrace();
+		surface->pixels=flip_address[flip_page];
+		vga_waitretrace();
+	}
 	return(0);
 }
 static void SVGA_DirectUpdate(_THIS, int numrects, SDL_Rect *rects)
 {
 	return;
 }
-/* FIXME: Can this be used under SVGAlib? */
 static void SVGA_BankedUpdate(_THIS, int numrects, SDL_Rect *rects)
 {
+	int i;
+	SDL_Rect *rect;
+	for ( i=0; i < numrects; ++i ) {
+		rect = &rects[i];
+		gl_copyboxtocontext(rect->x, rect->y, rect->w, rect->h, realgc, rect->x, rect->y);
+	}
 	return;
 }
 int SVGA_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors)
 {
 {
 	int i, j;
 	/* Reset the console video mode */
 	if ( this->screen && (this->screen->w && this->screen->h) ) {
+		if ( realgc ) {
+			free(realgc);
+			realgc = NULL;
+		}
+		if ( virtgc ) {
+			/* FIXME: Why does this crash?
+			gl_freecontext(virtgc);*/
+			free(virtgc);
+			virtgc = NULL;
+		}
 		vga_setmode(TEXT);
 	}
 	keyboard_close();
 	/* Free video mode lists */

Mercurial > sdl-ios-xcode

comparison src/video/svga/SDL_svgavideo.c @ 1554:0ca607a5d173