diff options
| author | Adam Jackson <ajax@nwnk.net> | 2004-07-30 20:30:57 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2004-07-30 20:30:57 +0000 |
| commit | 48514fee3c8ec26f36e142ffc9272e510b9a4238 (patch) | |
| tree | 2f0aaa0b3861f7ace00d2c1f5d0bc6a5e0ab8e93 /fb/fboverlay.h | |
| parent | 29012adb37c533f57c684ad94c4d83a6c31793e5 (diff) | |
Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
framebuffer formats except cfb and the overlay modes should work, and
r128 and radeon need to be loaded from the ati driver (both issues to
be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
drivers. elfloader users shouldn't be affected.
Diffstat (limited to 'fb/fboverlay.h')
| -rw-r--r-- | fb/fboverlay.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fb/fboverlay.h b/fb/fboverlay.h index 72891ece3..aecb3856f 100644 --- a/fb/fboverlay.h +++ b/fb/fboverlay.h @@ -27,7 +27,8 @@ #define _FBOVERLAY_H_ extern int fbOverlayGeneration; -extern int fbOverlayScreenPrivateIndex; +extern int fbOverlayScreenPrivateIndex; /* XXX should be static */ +extern int fbOverlayGetScreenPrivateIndex(void); #ifndef FB_OVERLAY_MAX #define FB_OVERLAY_MAX 2 @@ -58,8 +59,8 @@ typedef struct _fbOverlayScrPriv { } FbOverlayScrPrivRec, *FbOverlayScrPrivPtr; #define fbOverlayGetScrPriv(s) \ - ((fbOverlayScreenPrivateIndex != -1) ? \ - (s)->devPrivates[fbOverlayScreenPrivateIndex].ptr : NULL) + ((fbOverlayGetScreenPrivateIndex() != -1) ? \ + (s)->devPrivates[fbOverlayGetScreenPrivateIndex()].ptr : NULL) Bool fbOverlayCreateWindow(WindowPtr pWin); |