frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dga: Hide a bunch of implementation details 

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-07-08 14:03:13 -04:00
parent b5fbe9c632
commit 2377690709
3 changed files with 27 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
hw/xfree86/common/dgaproc.h
View File

@ -54,57 +54,15 @@ typedef struct {
/* DDX interface */ /* DDX interface */
extern _X_EXPORT int extern Bool DGAScreenAvailable(ScreenPtr pScreen);
DGASetMode(int Index, int num, XDGAModePtr mode, PixmapPtr *pPix); extern Bool DGAActive(int Index);
extern void DGAShutdown(void);
extern _X_EXPORT void extern Bool DGAVTSwitch(void);
DGASetInputMode(int Index, Bool keyboard, Bool mouse); extern Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index,
int button, int is_down);
extern _X_EXPORT void extern Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
DGASelectInput(int Index, ClientPtr client, long mask); extern Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index,
int key_code, int is_down);
extern _X_EXPORT Bool DGAAvailable(int Index);
extern _X_EXPORT Bool DGAScreenAvailable(ScreenPtr pScreen);
extern _X_EXPORT Bool DGAActive(int Index);
extern _X_EXPORT void DGAShutdown(void);
extern _X_EXPORT void DGAInstallCmap(ColormapPtr cmap);
extern _X_EXPORT int DGAGetViewportStatus(int Index);
extern _X_EXPORT int DGASync(int Index);
extern _X_EXPORT int
DGAFillRect(int Index, int x, int y, int w, int h, unsigned long color);
extern _X_EXPORT int
DGABlitRect(int Index, int srcx, int srcy, int w, int h, int dstx, int dsty);
extern _X_EXPORT int
DGABlitTransRect(int Index,
int srcx, int srcy,
int w, int h, int dstx, int dsty, unsigned long color);
extern _X_EXPORT int
DGASetViewport(int Index, int x, int y, int mode);
extern _X_EXPORT int DGAGetModes(int Index);
extern _X_EXPORT int DGAGetOldDGAMode(int Index);
extern _X_EXPORT int DGAGetModeInfo(int Index, XDGAModePtr mode, int num);
extern _X_EXPORT Bool DGAVTSwitch(void);
extern _X_EXPORT Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index,
int button, int is_down);
extern _X_EXPORT Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx,
int dy);
extern _X_EXPORT Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index,
int key_code, int is_down);
extern _X_EXPORT Bool DGAOpenFramebuffer(int Index, char **name,
unsigned char **mem, int *size,
int *offset, int *flags);
extern _X_EXPORT void DGACloseFramebuffer(int Index);
extern _X_EXPORT Bool DGAChangePixmapMode(int Index, int *x, int *y, int mode);
extern _X_EXPORT int DGACreateColormap(int Index, ClientPtr client, int id,
int mode, int alloc);
#endif /* __DGAPROC_H */ #endif /* __DGAPROC_H */

36
hw/xfree86/common/xf86DGA.c
View File

@ -471,7 +471,7 @@ xf86SetDGAMode(ScrnInfoPtr pScrn, int num, DGADevicePtr devRet)
/*********** exported ones ***************/ /*********** exported ones ***************/
void static void
DGASetInputMode(int index, Bool keyboard, Bool mouse) DGASetInputMode(int index, Bool keyboard, Bool mouse)
{ {
ScreenPtr pScreen = screenInfo.screens[index]; ScreenPtr pScreen = screenInfo.screens[index];
@ -488,7 +488,7 @@ DGASetInputMode(int index, Bool keyboard, Bool mouse)
} }
} }
Bool static Bool
DGAChangePixmapMode(int index, int *x, int *y, int mode) DGAChangePixmapMode(int index, int *x, int *y, int mode)
{ {
DGAScreenPtr pScreenPriv; DGAScreenPtr pScreenPriv;
@ -560,7 +560,7 @@ DGAScreenAvailable(ScreenPtr pScreen)
return FALSE; return FALSE;
} }
Bool static Bool
DGAAvailable(int index) DGAAvailable(int index)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
@ -606,7 +606,7 @@ DGAShutdown(void)
/* Called by the extension to initialize a mode */ /* Called by the extension to initialize a mode */
int static int
DGASetMode(int index, int num, XDGAModePtr mode, PixmapPtr *pPix) DGASetMode(int index, int num, XDGAModePtr mode, PixmapPtr *pPix)
{ {
ScrnInfoPtr pScrn = xf86Screens[index]; ScrnInfoPtr pScrn = xf86Screens[index];
@ -626,7 +626,7 @@ DGASetMode(int index, int num, XDGAModePtr mode, PixmapPtr *pPix)
/* Called from the extension to let the DDX know which events are requested */ /* Called from the extension to let the DDX know which events are requested */
void static void
DGASelectInput(int index, ClientPtr client, long mask) DGASelectInput(int index, ClientPtr client, long mask)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@ -636,7 +636,7 @@ DGASelectInput(int index, ClientPtr client, long mask)
pScreenPriv->input = mask; pScreenPriv->input = mask;
} }
int static int
DGAGetViewportStatus(int index) DGAGetViewportStatus(int index)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@ -649,7 +649,7 @@ DGAGetViewportStatus(int index)
return (*pScreenPriv->funcs->GetViewport) (pScreenPriv->pScrn); return (*pScreenPriv->funcs->GetViewport) (pScreenPriv->pScrn);
} }
int static int
DGASetViewport(int index, int x, int y, int mode) DGASetViewport(int index, int x, int y, int mode)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@ -675,7 +675,7 @@ BitsClear(CARD32 data)
return bits; return bits;
} }
int static int
DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc) DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc)
{ {
ScreenPtr pScreen = screenInfo.screens[index]; ScreenPtr pScreen = screenInfo.screens[index];
@ -744,7 +744,7 @@ DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc)
/* Called by the extension to install a colormap on DGA active screens */ /* Called by the extension to install a colormap on DGA active screens */
void static void
DGAInstallCmap(ColormapPtr cmap) DGAInstallCmap(ColormapPtr cmap)
{ {
ScreenPtr pScreen = cmap->pScreen; ScreenPtr pScreen = cmap->pScreen;
@ -760,7 +760,7 @@ DGAInstallCmap(ColormapPtr cmap)
(*pScreen->InstallColormap) (cmap); (*pScreen->InstallColormap) (cmap);
} }
int static int
DGASync(int index) DGASync(int index)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@ -773,7 +773,7 @@ DGASync(int index)
return Success; return Success;
} }
int static int
DGAFillRect(int index, int x, int y, int w, int h, unsigned long color) DGAFillRect(int index, int x, int y, int w, int h, unsigned long color)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@ -789,7 +789,7 @@ DGAFillRect(int index, int x, int y, int w, int h, unsigned long color)
return BadMatch; return BadMatch;
} }
int static int
DGABlitRect(int index, int srcx, int srcy, int w, int h, int dstx, int dsty) DGABlitRect(int index, int srcx, int srcy, int w, int h, int dstx, int dsty)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@ -806,7 +806,7 @@ DGABlitRect(int index, int srcx, int srcy, int w, int h, int dstx, int dsty)
return BadMatch; return BadMatch;
} }
int static int
DGABlitTransRect(int index, DGABlitTransRect(int index,
int srcx, int srcy, int srcx, int srcy,
int w, int h, int dstx, int dsty, unsigned long color) int w, int h, int dstx, int dsty, unsigned long color)
@ -826,7 +826,7 @@ DGABlitTransRect(int index,
return BadMatch; return BadMatch;
} }
int static int
DGAGetModes(int index) DGAGetModes(int index)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@ -836,7 +836,7 @@ DGAGetModes(int index)
return pScreenPriv->numModes; return pScreenPriv->numModes;
} }
int static int
DGAGetModeInfo(int index, XDGAModePtr mode, int num) DGAGetModeInfo(int index, XDGAModePtr mode, int num)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@ -1126,7 +1126,7 @@ DGAProcessPointerEvent(ScreenPtr pScreen, DGAEvent * event, DeviceIntPtr mouse)
} }
} }
Bool static Bool
DGAOpenFramebuffer(int index, DGAOpenFramebuffer(int index,
char **name, char **name,
unsigned char **mem, int *size, int *offset, int *flags) unsigned char **mem, int *size, int *offset, int *flags)
@ -1140,7 +1140,7 @@ DGAOpenFramebuffer(int index,
flags); flags);
} }
void static void
DGACloseFramebuffer(int index) DGACloseFramebuffer(int index)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@ -1152,7 +1152,7 @@ DGACloseFramebuffer(int index)
/* For DGA 1.0 backwards compatibility only */ /* For DGA 1.0 backwards compatibility only */
int static int
DGAGetOldDGAMode(int index) DGAGetOldDGAMode(int index)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

6
hw/xfree86/sdksyms.sh
View File

@ -180,12 +180,6 @@ cat > sdksyms.c << EOF
#endif #endif
/* hw/xfree86/dixmods/extmod/Makefile.am -- module */
#ifdef XFreeXDGA
#include "dgaproc.h"
#endif
/* hw/xfree86/parser/Makefile.am */ /* hw/xfree86/parser/Makefile.am */
#include "xf86Parser.h" #include "xf86Parser.h"
#include "xf86Optrec.h" #include "xf86Optrec.h"