sdl-ios-xcode: src/video/macdsp/SDL

comparison src/video/macdsp/SDL_dspvideo.c @ 1133:609c060fd2a2

The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails: To: SDL Developers <sdl@libsdl.org> From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se> Date: Mon, 30 May 2005 23:29:04 +0200 Subject: [SDL] Mac OS X Video Drivers [patch] I've updated/added the Carbon and X11 video drivers to the Mac OS X port of SDL 1.2 (the CVS version), and made the Cocoa driver and runtime *optional*. The default is still Cocoa, and the "Quartz" driver. But you can now also use "toolbox" for Carbon, and "x11" for running with Apple's (or other) X11 server: export SDL_VIDEODRIVER=x11 export SDL_VIDEO_GL_DRIVER=/usr/X11R6/lib/libGL.dylib It also checks if the frameworks are available, by a: #include <Carbon/Carbon.h> or #import <Cocoa/Cocoa.h> (this should make it configure on plain Darwin as well?) Here are the new configure targets: --enable-video-cocoa use Cocoa/Quartz video driver default=yes --enable-video-carbon use Carbon/QuickDraw video driver default=yes --enable-video-x11 use X11 video driver default=no ./configure --enable-video-cocoa --enable-video-carbon --enable-video-x11 \ --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib The Carbon version is just an updated version of the old SDL driver for Mac OS 9, and could probably be improved... (but it does work, including the Carbon version of SDLmain) If you disable cocoa, you can run with -framework Carbon only, and the C version of SDL_main.c. And if you disable carbon too, you can still use the X11 version which doesn't require SDLmain. I updated the DrawSprocket version, but did not include it. (no blitters or VRAM GWorlds etc. available on OS X anyway) Besides for Mac OS 9, I don't think there's any use for it ? And note that any performance on Mac OS X equals OpenGL anyway... You can get "fair" software SDL results on captured CG displays, but for decent frame rates you need to be using GL for rendering. Finally, here is the patch itself: http://www.algonet.se/~afb/SDL-12CVS-macvideo.patch --anders PS. It says "video", but as usual it applies to mouse/keyboard too. ------ To: A list for developers using the SDL library <sdl@libsdl.org> From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se> Date: Sun, 4 Sep 2005 10:02:15 +0200 Subject: [SDL] Updated Mac patch Updated the previous Mac patch to disable Carbon by default. Also "fixed" the SDL.spec again, so that it builds on Darwin. http://www.algonet.se/~afb/SDL-1.2.9-mac.patch Also applied fine to SDL12 CVS, when I tried it.

author	Ryan C. Gordon <icculus@icculus.org>
date	Thu, 08 Sep 2005 06:16:14 +0000
parents	c1c2efca4548
children	cf6133247d34

comparison

equal deleted inserted replaced

-:a0d3514c04b2
+:609c060fd2a2
 ------------------------------------------------------------------------------------
 System requirements (* denotes optional):
 1. DrawSprocket 1.7.3
-2. *MacOS 9 or later for hardware accelerated blit / fill
+2. *MacOS 9 or later (but *not* Mac OS X) for hardware accelerated blit / fill
 3. *May also require certain graphics hardware for (2). I trust that all Apple OEM
 hardware will work. Third party accelerators may work if they have QuickDraw
 acceleration in the drivers and the drivers have been updated for OS 9. The current
 Voodoo 3 drivers (1.0b12) do not work.
 #endif
 #include <stdio.h>
 #include <stdlib.h>
-#if TARGET_API_MAC_CARBON
+#if defined(__APPLE__) && defined(__MACH__)
+#include <Carbon/Carbon.h>
+#include <DrawSprocket/DrawSprocket.h>
+#elif TARGET_API_MAC_CARBON && (UNIVERSAL_INTERFACES_VERSION > 0x0335)
 #include <Carbon.h>
+#include <DrawSprocket.h>
 #else
 #include <LowMem.h>
 #include <Gestalt.h>
 #include <Devices.h>
 #include <DiskInit.h>
 #include <QDOffscreen.h>
+#include <DrawSprocket.h>
 #endif
 #include "SDL_video.h"
 #include "SDL_blit.h"
 #include "SDL_error.h"
 #include "SDL_syswm.h"
 #include "SDL_sysvideo.h"
+#include "SDL_pixels_c.h"
 #include "SDL_dspvideo.h"
 #include "SDL_macgl_c.h"
 #include "SDL_macwm_c.h"
 #include "SDL_macmouse_c.h"
 #include "SDL_macevents_c.h"
 /* Macintosh toolbox driver bootstrap functions */
 static int DSp_Available(void)
 {
 	/* Check for DrawSprocket */
+#if ! TARGET_API_MAC_OSX
 	/* This check is only meaningful if you weak-link DrawSprocketLib */
 	return ((Ptr)DSpStartup != (Ptr)kUnresolvedCFragSymbolAddress);
+#else
+	return 1; // DrawSprocket.framework doesn't have it all, but it's there
+#endif
 }
 static void DSp_DeleteDevice(SDL_VideoDevice *device)
 {
 	/* -dw- taking no chances with null pointers */
 OSStatus  err;
 Rect      bounds;
 SetRect (&bounds, 0, 0, 320, 240);
+#if useDistantHdwrMem && useLocalHdwrMem
 err = NewGWorld (&offscreen, vformat->BitsPerPixel, &bounds, NULL, SDL_Display, useDistantHdwrMem | noNewDevice);
 if (err == noErr) {
 dsp_vram_available = SDL_TRUE;
 DisposeGWorld (offscreen);
 }
 err = NewGWorld (&offscreen, vformat->BitsPerPixel, &bounds, NULL, SDL_Display, useLocalHdwrMem | noNewDevice);
 if (err == noErr) {
 DisposeGWorld (offscreen);
 dsp_agp_available = SDL_TRUE;
 }
+#endif
 }
 }
 static int DSp_GetMainDevice (_THIS, GDHandle *device)
 {
 #endif
 }
 static int DSp_VideoInit(_THIS, SDL_PixelFormat *vformat)
 {
+	NumVersion dsp_version;
-	NumVersion dsp_version = DSpGetVersion ();
+	dsp_version = DSpGetVersion ();
 	if (  (dsp_version.majorRev == 1 && dsp_version.minorAndBugRev < 0x73) ||
 	      (dsp_version.majorRev < 1)  ) {
 	   /* StandardAlert (kAlertStopAlert, "\pError!",
 }
 /* Various screen update functions available */
 static void DSp_DirectUpdate(_THIS, int numrects, SDL_Rect *rects);
+#if ! TARGET_API_MAC_OSX
 static volatile unsigned int retrace_count = 0; /* -dw- need volatile because it updates asychronously */
-#if ! TARGET_API_MAC_OSX
 Boolean DSp_VBLProc ( DSpContextReference context, void *ref_con )
 {
 	retrace_count++;
 	return 1; /* Darrell, is this right? */
 }
-#endif
 static void DSp_SetHWError (OSStatus err, int is_agp)
 {
 	char message[1024];
 	const char *fmt, *mem;
 		break;
 	}
 	sprintf(message, fmt, mem);
 	SDL_SetError(message);
 }
+#endif // TARGET_API_MAC_OSX
 /* put up a dialog to verify display change */
 static int DSp_ConfirmSwitch () {
 /* resource id's for dialog */
 dialog = GetNewDialog (rDialog, NULL, (WindowPtr) -1);
 if (dialog == NULL)
 	 return (0);
-SetPort (dialog);
+#if TARGET_API_CARBON
+SetPort (GetDialogPort(dialog));
+#else
+SetPort ((WindowPtr) dialog);
+#endif
 SetDialogDefaultItem (dialog, bCancel);
 SetDialogCancelItem  (dialog, bCancel);
 SetEventMask (everyEvent);
 ModalDialog ( NULL, &item );
 } while ( item != bCancel && item != bOK && err != noErr);
-DisposeWindow (dialog);
+DisposeDialog (dialog);
 SetPort (savePort);
 SetEventMask(everyEvent - autoKeyMask);
 FlushEvents(everyEvent, 0);
 static SDL_Surface *DSp_SetVideoMode(_THIS,
 	SDL_Surface *current, int width, int height, int bpp, Uint32 flags)
 {
-	DisplayIDType        display_id;
+#if !TARGET_API_MAC_OSX
+DisplayIDType        display_id;
+	Fixed freq;
+#endif
 	DSpContextAttributes attrib;
-	Fixed freq;
 	OSStatus err;
 	UInt32 rmask = 0, gmask = 0, bmask = 0;
 	int   page_count;
 	int   double_buf;
 		   return NULL;
 	   }
 	   /* Set window color to black to avoid white flash*/
 	   GetPort (&save_port);
+#if TARGET_API_MAC_CARBON
+		SetPort (GetWindowPort(SDL_Window));
+#else
 	   SetPort (SDL_Window);
+#endif
 	      RGBForeColor (&rgb);
 	      PaintRect    (&rect);
 	   SetPort (save_port);
 	   SetPortWindowPort (SDL_Window);
 OSStatus err;
 Rect     bounds;
 	SetRect (&bounds, 0, 0, width, height);
+#if useDistantHdwrMem && useLocalHdwrMem
 if (dsp_vram_available) {
 	   /* try VRAM */
 	  err = NewGWorld (port, depth, &bounds, 0 , SDL_Display, useDistantHdwrMem | noNewDevice );
 if (err != noErr)
 DSp_SetHWError (err, SDL_FALSE);
 if (err != noErr)
 DSp_SetHWError (err, SDL_TRUE);
 else
 return (0);
 }
+#endif
 return (-1);
 }
 static int DSp_AllocHWSurface(_THIS, SDL_Surface *surface)
 {
 	  if ( (surface->flags & SDL_HWSURFACE) ) {
 		CGrafPtr dsp_front_buffer, save_port;
 		Rect rect;
+#if ! TARGET_API_MAC_OSX
 		unsigned int old_count;
+	#endif
 		/* pseudo page flipping for VRAM back buffer*/
 		DSpContext_GetFrontBuffer (dsp_context, &dsp_front_buffer);
 		SetRect (&rect, 0, 0, surface->w-1, surface->h-1);
 		GetPort ((GrafPtr *)&save_port);

Mercurial > sdl-ios-xcode

comparison src/video/macdsp/SDL_dspvideo.c @ 1133:609c060fd2a2