Mercurial > sdl-ios-xcode

diff src/video/directfb/SDL_DirectFB_modes.h @ 5202:164f20ba08eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated the DirectFB support, from Couriersud attached is a working directfb driver diff which works with the current changes. There are a number of changes around it as well, e.g. configure.in. The directfb renderdriver right now still depends on a some "includes" from src/video/directfb. That's why it is not yet moved to the new render folder.
author Sam Lantinga <slouken@libsdl.org>
date Sat, 05 Feb 2011 16:07:10 -0800
parents 25b9cd8bdc30
children b530ef003506
line wrap: on
line diff
--- a/src/video/directfb/SDL_DirectFB_modes.h	Sat Feb 05 16:02:30 2011 -0800
+++ b/src/video/directfb/SDL_DirectFB_modes.h	Sat Feb 05 16:07:10 2011 -0800
@@ -18,32 +18,36 @@
 
     Sam Lantinga
     slouken@libsdl.org
+
+    SDL1.3 DirectFB driver by couriersud@arcor.de
+	
 */
-#include "SDL_config.h"
 
 #ifndef _SDL_directfb_modes_h
 #define _SDL_directfb_modes_h
 
-#include "SDL_DirectFB_video.h"
+#include <directfb.h>
 
-#define SDL_DFB_DISPLAYDATA(dev, win)  DFB_DisplayData *dispdata = ((win && dev) ? (DFB_DisplayData *) (win)->display->driverdata : NULL)
+#include "../SDL_sysvideo.h"
+
+#define SDL_DFB_DISPLAYDATA(win)  DFB_DisplayData *dispdata = ((win) ? (DFB_DisplayData *) (win)->display->driverdata : NULL)
 
 typedef struct _DFB_DisplayData DFB_DisplayData;
 struct _DFB_DisplayData
 {
-    IDirectFBDisplayLayer *layer;
-    DFBSurfacePixelFormat pixelformat;
+    IDirectFBDisplayLayer 	*layer;
+    DFBSurfacePixelFormat 	pixelformat;
     /* FIXME: support for multiple video layer. 
      * However, I do not know any card supporting 
      * more than one
      */
-    DFBDisplayLayerID vidID;
-    IDirectFBDisplayLayer *vidlayer;
+    DFBDisplayLayerID 		vidID;
+    IDirectFBDisplayLayer 	*vidlayer;
 
-    int vidIDinuse;
+    int 					vidIDinuse;
 
-    int cw;
-    int ch;
+    int 					cw;
+    int 					ch;
 };
 
 
@@ -52,6 +56,8 @@
 extern int DirectFB_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
 extern void DirectFB_QuitModes(_THIS);
 
+extern void DirectFB_SetContext(_THIS, SDL_Window *window);
+
 #endif /* _SDL_directfb_modes_h */
 
 /* vi: set ts=4 sw=4 expandtab: */