diff options
Diffstat (limited to 'exa')
-rw-r--r-- | exa/exa.c | 20 | ||||
-rw-r--r-- | exa/exa.h | 34 | ||||
-rw-r--r-- | exa/exa_migration.c | 4 | ||||
-rw-r--r-- | exa/exa_offscreen.c | 8 | ||||
-rw-r--r-- | exa/exa_unaccel.c | 2 |
5 files changed, 34 insertions, 34 deletions
@@ -67,7 +67,7 @@ ExaGetPixmapAddress(PixmapPtr p) * support for having multiple card-accessible offscreen, such as an AGP memory * pool alongside the framebuffer pool. */ -_X_EXPORT unsigned long +unsigned long exaGetPixmapOffset(PixmapPtr pPix) { ExaScreenPriv (pPix->drawable.pScreen); @@ -76,7 +76,7 @@ exaGetPixmapOffset(PixmapPtr pPix) (unsigned long)pExaScr->info->memoryBase); } -_X_EXPORT void * +void * exaGetPixmapDriverPrivate(PixmapPtr pPix) { ExaPixmapPriv(pPix); @@ -90,7 +90,7 @@ exaGetPixmapDriverPrivate(PixmapPtr pPix) * This is a helper to make driver code more obvious, due to the rather obscure * naming of the pitch field in the pixmap. */ -_X_EXPORT unsigned long +unsigned long exaGetPixmapPitch(PixmapPtr pPix) { return pPix->devKind; @@ -100,7 +100,7 @@ exaGetPixmapPitch(PixmapPtr pPix) * exaGetPixmapSize() returns the size in bytes of the given pixmap in video * memory. Only valid when the pixmap is currently in framebuffer. */ -_X_EXPORT unsigned long +unsigned long exaGetPixmapSize(PixmapPtr pPix) { ExaPixmapPrivPtr pExaPixmap; @@ -463,7 +463,7 @@ exaPixmapIsOffscreen(PixmapPtr p) /** * exaDrawableIsOffscreen() is a convenience wrapper for exaPixmapIsOffscreen(). */ -_X_EXPORT Bool +Bool exaDrawableIsOffscreen (DrawablePtr pDrawable) { return exaPixmapIsOffscreen (exaGetDrawablePixmap (pDrawable)); @@ -776,7 +776,7 @@ exaCloseScreen(int i, ScreenPtr pScreen) * * @return a newly allocated, zero-filled driver structure */ -_X_EXPORT ExaDriverPtr +ExaDriverPtr exaDriverAlloc(void) { return xcalloc(1, sizeof(ExaDriverRec)); @@ -792,7 +792,7 @@ exaDriverAlloc(void) * * @return TRUE if EXA was successfully initialized. */ -_X_EXPORT Bool +Bool exaDriverInit (ScreenPtr pScreen, ExaDriverPtr pScreenInfo) { @@ -1012,7 +1012,7 @@ exaDriverInit (ScreenPtr pScreen, * * @param pScreen screen being torn down. */ -_X_EXPORT void +void exaDriverFini (ScreenPtr pScreen) { /*right now does nothing*/ @@ -1029,7 +1029,7 @@ exaDriverFini (ScreenPtr pScreen) * driver MarkSync() callback, the return value of which may be used to do partial * synchronization with the hardware in the future. */ -_X_EXPORT void exaMarkSync(ScreenPtr pScreen) +void exaMarkSync(ScreenPtr pScreen) { ExaScreenPriv(pScreen); @@ -1048,7 +1048,7 @@ _X_EXPORT void exaMarkSync(ScreenPtr pScreen) * It should always be called before relying on the framebuffer contents * reflecting previous drawing, from a CPU perspective. */ -_X_EXPORT void exaWaitSync(ScreenPtr pScreen) +void exaWaitSync(ScreenPtr pScreen) { ExaScreenPriv(pScreen); @@ -745,63 +745,63 @@ typedef struct _ExaDriver { /** @} */ /* in exa.c */ -ExaDriverPtr +extern _X_EXPORT ExaDriverPtr exaDriverAlloc(void); -Bool +extern _X_EXPORT Bool exaDriverInit(ScreenPtr pScreen, ExaDriverPtr pScreenInfo); -void +extern _X_EXPORT void exaDriverFini(ScreenPtr pScreen); -void +extern _X_EXPORT void exaMarkSync(ScreenPtr pScreen); -void +extern _X_EXPORT void exaWaitSync(ScreenPtr pScreen); -unsigned long +extern _X_EXPORT unsigned long exaGetPixmapOffset(PixmapPtr pPix); -unsigned long +extern _X_EXPORT unsigned long exaGetPixmapPitch(PixmapPtr pPix); -unsigned long +extern _X_EXPORT unsigned long exaGetPixmapSize(PixmapPtr pPix); -void * +extern _X_EXPORT void * exaGetPixmapDriverPrivate(PixmapPtr p); /* in exa_offscreen.c */ -ExaOffscreenArea * +extern _X_EXPORT ExaOffscreenArea * exaOffscreenAlloc(ScreenPtr pScreen, int size, int align, Bool locked, ExaOffscreenSaveProc save, pointer privData); -ExaOffscreenArea * +extern _X_EXPORT ExaOffscreenArea * exaOffscreenFree(ScreenPtr pScreen, ExaOffscreenArea *area); -void +extern _X_EXPORT void ExaOffscreenMarkUsed (PixmapPtr pPixmap); -void +extern _X_EXPORT void exaEnableDisableFBAccess (int index, Bool enable); -Bool +extern _X_EXPORT Bool exaDrawableIsOffscreen (DrawablePtr pDrawable); /* in exa_migration.c */ -void +extern _X_EXPORT void exaMoveInPixmap (PixmapPtr pPixmap); -void +extern _X_EXPORT void exaMoveOutPixmap (PixmapPtr pPixmap); /* in exa_unaccel.c */ -CARD32 +extern _X_EXPORT CARD32 exaGetPixmapFirstPixel (PixmapPtr pPixmap); diff --git a/exa/exa_migration.c b/exa/exa_migration.c index f31cce319..571650c83 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -348,7 +348,7 @@ exaDoMoveInPixmap (ExaMigrationPtr migrate) pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; } -_X_EXPORT void +void exaMoveInPixmap (PixmapPtr pPixmap) { static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE, @@ -389,7 +389,7 @@ exaDoMoveOutPixmap (ExaMigrationPtr migrate) } } -_X_EXPORT void +void exaMoveOutPixmap (PixmapPtr pPixmap) { static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE, diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c index 95656bf46..4aaa2c132 100644 --- a/exa/exa_offscreen.c +++ b/exa/exa_offscreen.c @@ -164,7 +164,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align) * requested version 2.1 or newer behavior. In that case, the save callback is * still called. */ -_X_EXPORT ExaOffscreenArea * +ExaOffscreenArea * exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, Bool locked, ExaOffscreenSaveProc save, @@ -365,7 +365,7 @@ ExaOffscreenSwapIn (ScreenPtr pScreen) * many drivers that could otherwise handle the lack of FB access while * swapped out. */ -_X_EXPORT void +void exaEnableDisableFBAccess (int index, Bool enable) { ScreenPtr pScreen = screenInfo.screens[index]; @@ -412,7 +412,7 @@ ExaOffscreenMerge (ExaOffscreenArea *area) * @return pointer to the newly freed area. This behavior should not be relied * on. */ -_X_EXPORT ExaOffscreenArea * +ExaOffscreenArea * exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area) { ExaScreenPriv(pScreen); @@ -453,7 +453,7 @@ exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area) return area; } -_X_EXPORT void +void ExaOffscreenMarkUsed (PixmapPtr pPixmap) { ExaPixmapPriv (pPixmap); diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c index 6e75d7893..64c06c7c0 100644 --- a/exa/exa_unaccel.c +++ b/exa/exa_unaccel.c @@ -373,7 +373,7 @@ ExaCheckAddTraps (PicturePtr pPicture, * * XXX This really belongs in fb, so it can be aware of tiling and etc. */ -_X_EXPORT CARD32 +CARD32 exaGetPixmapFirstPixel (PixmapPtr pPixmap) { CARD32 pixel; |