aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/exa
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/exa')
-rw-r--r--xorg-server/exa/exa.c14
-rw-r--r--xorg-server/exa/exa.h6
-rw-r--r--xorg-server/exa/exa_classic.c2
-rw-r--r--xorg-server/exa/exa_driver.c4
-rw-r--r--xorg-server/exa/exa_glyphs.c8
-rw-r--r--xorg-server/exa/exa_migration_classic.c8
-rw-r--r--xorg-server/exa/exa_mixed.c4
-rw-r--r--xorg-server/exa/exa_offscreen.c2
-rw-r--r--xorg-server/exa/exa_priv.h22
-rw-r--r--xorg-server/exa/exa_unaccel.c4
10 files changed, 41 insertions, 33 deletions
diff --git a/xorg-server/exa/exa.c b/xorg-server/exa/exa.c
index f8e499c2b..a2995db24 100644
--- a/xorg-server/exa/exa.c
+++ b/xorg-server/exa/exa.c
@@ -475,7 +475,7 @@ static void
exaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
static void
- exaChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects);
+ exaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects);
static void
exaCopyClip(GCPtr pGCDst, GCPtr pGCSrc);
@@ -579,7 +579,7 @@ exaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
}
static void
-exaChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+exaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
ExaGCPriv(pGC);
swap(pExaGC, pGC, funcs);
@@ -620,8 +620,8 @@ exaCreateGC(GCPtr pGC)
swap(pExaScr, pScreen, CreateGC);
if ((ret = (*pScreen->CreateGC) (pGC))) {
- wrap(pExaGC, pGC, funcs, (GCFuncs *) &exaGCFuncs);
- wrap(pExaGC, pGC, ops, (GCOps *) &exaOps);
+ wrap(pExaGC, pGC, funcs, &exaGCFuncs);
+ wrap(pExaGC, pGC, ops, &exaOps);
}
swap(pExaScr, pScreen, CreateGC);
@@ -702,8 +702,8 @@ exaCreateScreenResources(ScreenPtr pScreen)
}
static void
-ExaBlockHandler(ScreenPtr pScreen, pointer pTimeout,
- pointer pReadmask)
+ExaBlockHandler(ScreenPtr pScreen, void *pTimeout,
+ void *pReadmask)
{
ExaScreenPriv(pScreen);
@@ -733,7 +733,7 @@ ExaBlockHandler(ScreenPtr pScreen, pointer pTimeout,
static void
ExaWakeupHandler(ScreenPtr pScreen, unsigned long result,
- pointer pReadmask)
+ void *pReadmask)
{
ExaScreenPriv(pScreen);
diff --git a/xorg-server/exa/exa.h b/xorg-server/exa/exa.h
index be022b2db..98d094dff 100644
--- a/xorg-server/exa/exa.h
+++ b/xorg-server/exa/exa.h
@@ -58,7 +58,7 @@ struct _ExaOffscreenArea {
int offset; /* aligned offset */
int size; /* total allocation size */
unsigned last_use;
- pointer privData;
+ void *privData;
ExaOffscreenSaveProc save;
@@ -685,7 +685,7 @@ typedef struct _ExaDriver {
*/
Bool (*ModifyPixmapHeader) (PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData);
+ void *pPixData);
/* hooks for drivers with tiling support:
* driver MUST fill out new_fb_pitch with valid pitch of pixmap
@@ -784,7 +784,7 @@ extern _X_EXPORT ExaOffscreenArea *exaOffscreenAlloc(ScreenPtr pScreen,
int size, int align,
Bool locked,
ExaOffscreenSaveProc save,
- pointer privData);
+ void *privData);
extern _X_EXPORT ExaOffscreenArea *exaOffscreenFree(ScreenPtr pScreen,
ExaOffscreenArea * area);
diff --git a/xorg-server/exa/exa_classic.c b/xorg-server/exa/exa_classic.c
index 0fa422fcd..a6a60e50c 100644
--- a/xorg-server/exa/exa_classic.c
+++ b/xorg-server/exa/exa_classic.c
@@ -147,7 +147,7 @@ exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth,
Bool
exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData)
+ void *pPixData)
{
ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr;
diff --git a/xorg-server/exa/exa_driver.c b/xorg-server/exa/exa_driver.c
index d467ca928..8799a798e 100644
--- a/xorg-server/exa/exa_driver.c
+++ b/xorg-server/exa/exa_driver.c
@@ -130,7 +130,7 @@ exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,
Bool
exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData)
+ void *pPixData)
{
ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr;
@@ -218,7 +218,7 @@ exaPixmapHasGpuCopy_driver(PixmapPtr pPixmap)
ScreenPtr pScreen = pPixmap->drawable.pScreen;
ExaScreenPriv(pScreen);
- pointer saved_ptr;
+ void *saved_ptr;
Bool ret;
saved_ptr = pPixmap->devPrivate.ptr;
diff --git a/xorg-server/exa/exa_glyphs.c b/xorg-server/exa/exa_glyphs.c
index 71f750fb6..aa71b215e 100644
--- a/xorg-server/exa/exa_glyphs.c
+++ b/xorg-server/exa/exa_glyphs.c
@@ -127,7 +127,7 @@ exaUnrealizeGlyphCaches(ScreenPtr pScreen, unsigned int format)
continue;
if (cache->picture) {
- FreePicture((pointer) cache->picture, (XID) 0);
+ FreePicture((void *) cache->picture, (XID) 0);
cache->picture = NULL;
}
@@ -225,7 +225,7 @@ exaRealizeGlyphCaches(ScreenPtr pScreen, unsigned int format)
}
/* Each cache references the picture individually */
- FreePicture((pointer) pPicture, (XID) 0);
+ FreePicture((void *) pPicture, (XID) 0);
return TRUE;
bail:
@@ -737,7 +737,7 @@ exaGlyphs(CARD8 op,
/* The driver can't seem to composite to a8, let's try argb (but
* without component-alpha) */
- FreePicture((pointer) pMask, (XID) 0);
+ FreePicture((void *) pMask, (XID) 0);
argbFormat = PictureMatchFormat(pScreen, 32, PICT_a8r8g8b8);
@@ -833,7 +833,7 @@ exaGlyphs(CARD8 op,
pDst,
xSrc + x - first_xOff,
ySrc + y - first_yOff, 0, 0, x, y, width, height);
- FreePicture((pointer) pMask, (XID) 0);
+ FreePicture((void *) pMask, (XID) 0);
(*pScreen->DestroyPixmap) (pMaskPixmap);
}
}
diff --git a/xorg-server/exa/exa_migration_classic.c b/xorg-server/exa/exa_migration_classic.c
index 65bbb17ce..89eff6200 100644
--- a/xorg-server/exa/exa_migration_classic.c
+++ b/xorg-server/exa/exa_migration_classic.c
@@ -350,7 +350,7 @@ exaDoMoveInPixmap(ExaMigrationPtr migrate)
pExaPixmap->area =
exaOffscreenAlloc(pScreen, pExaPixmap->fb_size,
pExaScr->info->pixmapOffsetAlign, FALSE,
- exaPixmapSave, (pointer) pPixmap);
+ exaPixmapSave, (void *) pPixmap);
if (pExaPixmap->area == NULL)
return;
@@ -465,12 +465,12 @@ exaMigrateTowardFb(ExaMigrationPtr migrate)
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) {
DBG_MIGRATE(("UseScreen: not migrating pinned pixmap %p\n",
- (pointer) pPixmap));
+ (void *) pPixmap));
return;
}
DBG_MIGRATE(("UseScreen %p score %d\n",
- (pointer) pPixmap, pExaPixmap->score));
+ (void *) pPixmap, pExaPixmap->score));
if (pExaPixmap->score == EXA_PIXMAP_SCORE_INIT) {
exaDoMoveInPixmap(migrate);
@@ -504,7 +504,7 @@ exaMigrateTowardSys(ExaMigrationPtr migrate)
ExaPixmapPriv(pPixmap);
- DBG_MIGRATE(("UseMem: %p score %d\n", (pointer) pPixmap,
+ DBG_MIGRATE(("UseMem: %p score %d\n", (void *) pPixmap,
pExaPixmap->score));
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
diff --git a/xorg-server/exa/exa_mixed.c b/xorg-server/exa/exa_mixed.c
index b43dfec42..f618a1ea8 100644
--- a/xorg-server/exa/exa_mixed.c
+++ b/xorg-server/exa/exa_mixed.c
@@ -125,7 +125,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
Bool
exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
- int bitsPerPixel, int devKind, pointer pPixData)
+ int bitsPerPixel, int devKind, void *pPixData)
{
ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr;
@@ -282,7 +282,7 @@ exaPixmapHasGpuCopy_mixed(PixmapPtr pPixmap)
ExaScreenPriv(pScreen);
ExaPixmapPriv(pPixmap);
- pointer saved_ptr;
+ void *saved_ptr;
Bool ret;
if (!pExaPixmap->driverPriv)
diff --git a/xorg-server/exa/exa_offscreen.c b/xorg-server/exa/exa_offscreen.c
index 1f571cf22..e28734898 100644
--- a/xorg-server/exa/exa_offscreen.c
+++ b/xorg-server/exa/exa_offscreen.c
@@ -160,7 +160,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align)
*/
ExaOffscreenArea *
exaOffscreenAlloc(ScreenPtr pScreen, int size, int align,
- Bool locked, ExaOffscreenSaveProc save, pointer privData)
+ Bool locked, ExaOffscreenSaveProc save, void *privData)
{
ExaOffscreenArea *area;
diff --git a/xorg-server/exa/exa_priv.h b/xorg-server/exa/exa_priv.h
index 1f5605687..61a1f4ccb 100644
--- a/xorg-server/exa/exa_priv.h
+++ b/xorg-server/exa/exa_priv.h
@@ -248,11 +248,19 @@ extern DevPrivateKeyRec exaScreenPrivateKeyRec;
real->mem = priv->Saved##mem; \
}
+#ifdef HAVE_TYPEOF
+#define swap(priv, real, mem) {\
+ typeof(real->mem) tmp = priv->Saved##mem; \
+ priv->Saved##mem = real->mem; \
+ real->mem = tmp; \
+}
+#else
#define swap(priv, real, mem) {\
void *tmp = priv->Saved##mem; \
priv->Saved##mem = real->mem; \
real->mem = tmp; \
}
+#endif
#define EXA_PRE_FALLBACK(_screen_) \
ExaScreenPriv(_screen_); \
@@ -333,8 +341,8 @@ typedef struct {
typedef struct {
/* GC values from the layer below. */
- GCOps *Savedops;
- GCFuncs *Savedfuncs;
+ const GCOps *Savedops;
+ const GCFuncs *Savedfuncs;
} ExaGCPrivRec, *ExaGCPrivPtr;
typedef struct {
@@ -422,13 +430,13 @@ void
ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase);
+ CharInfoPtr * ppci, void *pglyphBase);
void
ExaCheckPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase);
+ CharInfoPtr * ppci, void *pglyphBase);
void
@@ -601,7 +609,7 @@ Bool
exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData);
+ void *pPixData);
Bool
exaDestroyPixmap_classic(PixmapPtr pPixmap);
@@ -619,7 +627,7 @@ Bool
exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData);
+ void *pPixData);
Bool
exaDestroyPixmap_driver(PixmapPtr pPixmap);
@@ -636,7 +644,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
Bool
exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
- int bitsPerPixel, int devKind, pointer pPixData);
+ int bitsPerPixel, int devKind, void *pPixData);
Bool
exaDestroyPixmap_mixed(PixmapPtr pPixmap);
diff --git a/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c
index 3bfbb4fe9..b66eeee7b 100644
--- a/xorg-server/exa/exa_unaccel.c
+++ b/xorg-server/exa/exa_unaccel.c
@@ -319,7 +319,7 @@ ExaCheckPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
void
ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase)
+ CharInfoPtr * ppci, void *pglyphBase)
{
EXA_PRE_FALLBACK_GC(pGC);
EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));
@@ -334,7 +334,7 @@ ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
void
ExaCheckPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase)
+ CharInfoPtr * ppci, void *pglyphBase)
{
EXA_PRE_FALLBACK_GC(pGC);
EXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 01:37:05 +0000