Commit 1f0e8bd5 authored by Dave Airlie's avatar Dave Airlie

api: rework the X server driver API to avoid global arrays.

This is a squash merge containing all the API changes, as
well as the video ABI bump.

Its been squashed to make bisection easier.

Full patch log below:

commit b202738bbf0c5a1c1172767119c2c71f1e7f8070
Author: Aaron Plattner <aplattner@nvidia.com>
Date:   Mon May 14 15:16:11 2012 -0700

    xfree86: Bump video ABI to 13.0

    The ABI was broken by changes to convert from screen index numbers to ScreenPtr
    / ScrnInfoPtr in various structures and function signatures.
Signed-off-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 3d5f7d9f8d408bcad3f83277d255f25d3b0edbf3
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu May 24 10:56:57 2012 +0100

    xf86: xf86ClearEntityListForScreen should take a pScrn

    When adding GPU screens this make life easier.

    (also fix comment, as pointed out by Alan)
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit afee8b5ab4501597ecc1ade34124d7ca227ab055
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu May 24 07:07:32 2012 +0100

    xf86i2c: add pscrn for drivers to use

    This just adds a pScrn pointer into the struct for the drivers to use
    instead of scrnIndex. Mostly scrnIndex is used for logging, but some
    drivers use it to lookup xf86Screens, so let them stash a pScrn instead.

    Removing the scrnIndex is a bit more involved and I'm not sure its worth
    the effort. Doing i2c in the X server is legacy code as far as I'm concerned.
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit ea5092f1f679691d187f1eee9427e6057beec56e
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed May 23 19:25:20 2012 +0100

    dix/gc: consolidate GC object creation in one place

    The standard GC create and scratch GC create were 90% the same really,
    and I have a need in the future for creating GC objects without the
    other bits, so wanted to avoid a third copy.
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 3d91482ea9b4883e64e496f2768168e0ffa21ba1
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed May 23 10:24:06 2012 +0100

    xf86: add a define to denote the new non-index interfaces are being used

    This can be used by drivers to provide compatible APIs.
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 37c3ae3e6cd4f3dedc72f371096d6743f8f99df3
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed May 23 15:09:12 2012 +0100

    dix: make Create/Free scratch pixmaps take a ScreenPtr

    While technically an API/ABI change I doubt anyone uses it,
    but it helps in splitting screens up.
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 75f2062a3fe94f04764ecc7d2ff2fbbeccb9da60
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed May 23 14:57:55 2012 +0100

    xf86/xv: remove scrnIndexfrom xf86FindXvOptions.

    Move this interface to taking an ScrnInfoPtr.
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit f80c2374f40ea7b2ee0556e2e76cc07406f3d843
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed May 23 14:53:59 2012 +0100

    xf86: make xf86DeleteScreen take a ScrnInfoPtr (v2)

    stop passing indices into this function.

    v2: drop flags argument.
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 58824e414f35682435f15bfe6c4b656bd90b9235
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed May 23 14:48:09 2012 +0100

    xf86: fix xf86IsScreenPrimary interface to take a pScrn (API/ABI)
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 6b4fc1f9d391bcdf7ca288766e49bce60f4635cd
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 14:18:59 2012 +0100

    xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API) (v2)

    Instead of passing an index, pass the actual ScreenPtr. This allows
    more moving towards not abusing xf86Screens + screenInfo.

    v2: drop the blockData/wakeupData args as per ajax's suggestion.,
    fix docs.
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 790d003de20fb47674420a24dadd92412d78620d
Author: Dave Airlie <airlied@gmail.com>
Date:   Wed Apr 11 09:53:14 2012 +0100

    xf86/common: remove some more pScrn->pScreen uses

    remove some more conversions that appeared after api cleanups.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit aac85e18d1dd093f2cad6bd29375e40bd7af0b8f
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 16:34:53 2012 +0100

    ddc: change API to take ScrnInfoPtr (v2)

    This removes all xf86Screens usage from ddc code,
    it modifies the API for some functions to avoid taking indices.

    v2: address Alan's comments about dropping DDC2Init parameter.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit fe3f57b6eaf6860a33876a54f9439f69578f03a5
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 16:31:26 2012 +0100

    vbe: don't use index for VBEInterpretPanelID (API)

    Remove use of xf86screens from vbe module.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit abf1965f4ed91529036d3fdb470d6a3ce6f29675
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 16:25:11 2012 +0100

    int10/vbe: don't use xf86Screens. (ABI) (v3)

    Pass the ScrnInfoPtr instead of the index in the int10 struct.

    This saves us using it to dereference xf86Screens.

    v2: address Alan's comment to fix struct alignment.

    v3: squash in all the int10 fixes, test the vm86 code builds,
    after comments by Keith.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 23cca612b4fb5efc33683c7624b803b457387e3d
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 15:30:18 2012 +0100

    xserver: drop index argument to ScreenInit (ABI/API) (v2)

    This drops the index argument, its the same as pScreen->myNum,
    and its the last major index abuse I can find.

    v2: address Alan's review - update docs, fix xwin/xnest/darwin
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 40d360e2d7e832407f3ed64e3a02c27ecc89a960
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 15:23:01 2012 +0100

    xf86: migrate PointerMoved from index to ScrnInfoPtr (ABI/API)

    This migrates PointerMoved from an index to ScrnInfoPtr.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit aa60a2f38679d0eeb979a9c2648c9bc771409bf9
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 15:20:46 2012 +0100

    xf86: migrate PMEvent to a ScrnInfoPtr (ABI/API)

    This migrates the PMEvent from index to ScrnInfoPtr.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit d3f28ef44371ed4a039ffc5dd7eb6408d1269ba2
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 15:18:30 2012 +0100

    xf86: migrate SetDGAMode from index to ScrnInfoPtr (ABI/API)

    This migrates the SetDGAMode callback from an index to ScrnInfoPtr.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit baf5e4818a74f2b68c3dfdcc56f54322351039a0
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 15:14:11 2012 +0100

    xf86: migrate ChangeGamma from index to ScrnInfoPtr (ABI/API) (v2)

    This migrates the ChangeGamma interface to avoid passing a index.

    v2: fix xf86RandR12.c + xf86cmap.c call
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 51e5f90ada929d6b23176090badbb42fdb3fa550
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 15:11:09 2012 +0100

    xf86/exa: migrate index to screen types for EnableDisableFBAccess (ABI/API)

    The EXA interface migrates to ScreenPtr,
    and the xf86 interface migrated to ScrnInfoPtr.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 94f1f21d17e86f96d4a54292a399160950087675
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 15:02:11 2012 +0100

    xf86: migrate ValidMode callback to ScrnInfoPtr (ABI/API)

    This migrates the ValidMode to passing a ScrnInfoPtr instead
    of an index.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 3f8f18198fed4f39ec805b508a3482e91eea26b2
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 14:59:46 2012 +0100

    xf86: migrate SwitchMode to taking ScrnInfoPtr (ABI/API) (v2)

    This migrate the SwitchMode interface to take a ScrnInfoPtr
    instead of an index.

    v2: drop flags.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit d06a038a5c49328ab3a8d969d24f9fcd22c63202
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 14:50:37 2012 +0100

    xf86: move AdjustFrame to passing ScrnInfoPtr (ABI/API) (v2)

    This converts AdjustFrame code paths to passing a ScrnInfoPtr
    instead of an integer index.

    v2: drop flags args.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 53d2f8608ffd4090d08e7d5cf2e92fb954959b90
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 14:41:27 2012 +0100

    xf86: modify FreeScreen callback to take pScrn instead of index. (ABI/API) (v2)

    Another index->pScrn conversion.

    v2: drop flags arg.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 60db37c0b247052e0f5c54b1921fe58a3609c2e3
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 14:35:41 2012 +0100

    xf86: change EnterVT/LeaveVT to take a ScrnInfoPtr (ABI/API break) (v2)

    This modifies the EnterVT/LeaveVT interfaces to take a ScrnInfoPtr
    instead of an index into xf86Screens. This allows dropping more
    public dereferences of the xf86Screens and screenInfo.

    v2: drop flags args as suggested by Keith, fix docs.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

commit 06729dbbc804a20242e6499f446acb5d94023c3c
Author: Dave Airlie <airlied@gmail.com>
Date:   Tue Apr 10 14:04:59 2012 +0100

    xserver: remove index from CloseScreen (API/ABI breakage)

    This drops the index from the CloseScreen callback,
    its always been useless really, since the pScreen contains it.
Reviewed-by: default avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: default avatarAaron Plattner <aplattner@nvidia.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 3476eb38
......@@ -150,7 +150,7 @@ static GCFuncs XineramaGCFuncs = {
(pGC)->funcs = &XineramaGCFuncs;
static Bool
XineramaCloseScreen(int i, ScreenPtr pScreen)
XineramaCloseScreen(ScreenPtr pScreen)
{
PanoramiXScreenPtr pScreenPriv = (PanoramiXScreenPtr)
dixLookupPrivate(&pScreen->devPrivates, PanoramiXScreenKey);
......@@ -163,7 +163,7 @@ XineramaCloseScreen(int i, ScreenPtr pScreen)
free((pointer) pScreenPriv);
return (*pScreen->CloseScreen) (i, pScreen);
return (*pScreen->CloseScreen) (pScreen);
}
static Bool
......
......@@ -202,14 +202,14 @@ CheckForShmSyscall(void)
#endif
static Bool
ShmCloseScreen(int i, ScreenPtr pScreen)
ShmCloseScreen(ScreenPtr pScreen)
{
ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);
pScreen->CloseScreen = screen_priv->CloseScreen;
dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, NULL);
free(screen_priv);
return (*pScreen->CloseScreen) (i, pScreen);
return (*pScreen->CloseScreen) (pScreen);
}
static ShmScrPrivateRec *
......
......@@ -215,7 +215,7 @@ typedef struct {
DestroyWindowProcPtr DestroyWindow;
DestroyPixmapProcPtr DestroyPixmap;
CloseScreenProcPtr CloseScreen;
Bool (*ddCloseScreen) (int, ScreenPtr);
Bool (*ddCloseScreen) (ScreenPtr);
int (*ddQueryAdaptors) (ScreenPtr, XvAdaptorPtr *, int *);
DevUnion devPriv;
} XvScreenRec, *XvScreenPtr;
......
......@@ -129,7 +129,7 @@ static void WriteSwappedVideoNotifyEvent(xvEvent *, xvEvent *);
static void WriteSwappedPortNotifyEvent(xvEvent *, xvEvent *);
static Bool CreateResourceTypes(void);
static Bool XvCloseScreen(int, ScreenPtr);
static Bool XvCloseScreen(ScreenPtr);
static Bool XvDestroyPixmap(PixmapPtr);
static Bool XvDestroyWindow(WindowPtr);
static void XvResetProc(ExtensionEntry *);
......@@ -290,7 +290,7 @@ XvScreenInit(ScreenPtr pScreen)
}
static Bool
XvCloseScreen(int ii, ScreenPtr pScreen)
XvCloseScreen(ScreenPtr pScreen)
{
XvScreenPtr pxvs;
......@@ -301,13 +301,13 @@ XvCloseScreen(int ii, ScreenPtr pScreen)
pScreen->DestroyWindow = pxvs->DestroyWindow;
pScreen->CloseScreen = pxvs->CloseScreen;
(*pxvs->ddCloseScreen) (ii, pScreen);
(*pxvs->ddCloseScreen) (pScreen);
free(pxvs);
dixSetPrivate(&pScreen->devPrivates, XvScreenKey, NULL);
return (*pScreen->CloseScreen) (ii, pScreen);
return (*pScreen->CloseScreen) (pScreen);
}
static void
......
......@@ -709,7 +709,7 @@ XvMCExtensionInit(void)
}
static Bool
XvMCCloseScreen(int i, ScreenPtr pScreen)
XvMCCloseScreen(ScreenPtr pScreen)
{
XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pScreen);
......@@ -717,7 +717,7 @@ XvMCCloseScreen(int i, ScreenPtr pScreen)
free(pScreenPriv);
return (*pScreen->CloseScreen) (i, pScreen);
return (*pScreen->CloseScreen) (pScreen);
}
int
......
......@@ -55,14 +55,13 @@ compScreenUpdate(ScreenPtr pScreen)
}
static void
compBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
compBlockHandler(ScreenPtr pScreen, pointer pTimeout, pointer pReadmask)
{
ScreenPtr pScreen = screenInfo.screens[i];
CompScreenPtr cs = GetCompScreen(pScreen);
pScreen->BlockHandler = cs->BlockHandler;
compScreenUpdate(pScreen);
(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
(*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
/* Next damage will restore the block handler */
cs->BlockHandler = NULL;
......
......@@ -53,7 +53,7 @@ DevPrivateKeyRec CompWindowPrivateKeyRec;
DevPrivateKeyRec CompSubwindowsPrivateKeyRec;
static Bool
compCloseScreen(int index, ScreenPtr pScreen)
compCloseScreen(ScreenPtr pScreen)
{
CompScreenPtr cs = GetCompScreen(pScreen);
Bool ret;
......@@ -82,7 +82,7 @@ compCloseScreen(int index, ScreenPtr pScreen)
free(cs);
dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL);
ret = (*pScreen->CloseScreen) (index, pScreen);
ret = (*pScreen->CloseScreen) (pScreen);
return ret;
}
......
......@@ -3725,8 +3725,7 @@ with its screen number, a pointer to its ScreenRec, argc, and argv.
*/
int
AddScreen(Bool (*pfnInit) (int /*index */ ,
ScreenPtr /*pScreen */ ,
AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
int /*argc */ ,
char ** /*argv */
), int argc, char **argv)
......@@ -3794,7 +3793,7 @@ AddScreen(Bool (*pfnInit) (int /*index */ ,
*/
screenInfo.screens[i] = pScreen;
screenInfo.numScreens++;
if (!(*pfnInit) (i, pScreen, argc, argv)) {
if (!(*pfnInit) (pScreen, argc, argv)) {
dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN);
free(pScreen);
screenInfo.numScreens--;
......
......@@ -384,9 +384,8 @@ BlockHandler(pointer pTimeout, pointer pReadmask)
++inHandler;
for (i = 0; i < screenInfo.numScreens; i++)
(*screenInfo.screens[i]->BlockHandler) (i,
screenInfo.screens[i]->
blockData, pTimeout, pReadmask);
(*screenInfo.screens[i]->BlockHandler) (screenInfo.screens[i],
pTimeout, pReadmask);
for (i = 0; i < numHandlers; i++)
if (!handlers[i].deleted)
(*handlers[i].BlockHandler) (handlers[i].blockData,
......@@ -421,9 +420,8 @@ WakeupHandler(int result, pointer pReadmask)
(*handlers[i].WakeupHandler) (handlers[i].blockData,
result, pReadmask);
for (i = 0; i < screenInfo.numScreens; i++)
(*screenInfo.screens[i]->WakeupHandler) (i,
screenInfo.screens[i]->
wakeupData, result, pReadmask);
(*screenInfo.screens[i]->WakeupHandler) (screenInfo.screens[i],
result, pReadmask);
if (handlerDeleted) {
for (i = 0; i < numHandlers;)
if (handlers[i].deleted) {
......
......@@ -458,32 +458,21 @@ ChangeGCXIDs(ClientPtr client, GC * pGC, BITS32 mask, CARD32 *pC32)
return ChangeGC(client, pGC, mask, vals);
}
/* CreateGC(pDrawable, mask, pval, pStatus)
creates a default GC for the given drawable, using mask to fill
in any non-default values.
Returns a pointer to the new GC on success, NULL otherwise.
returns status of non-default fields in pStatus
BUG:
should check for failure to create default tile
*/
GCPtr
CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
XID gcid, ClientPtr client)
static GCPtr
NewGCObject(ScreenPtr pScreen, int depth)
{
GCPtr pGC;
pGC = dixAllocateObjectWithPrivates(GC, PRIVATE_GC);
if (!pGC) {
*pStatus = BadAlloc;
return (GCPtr) NULL;
}
pGC->pScreen = pDrawable->pScreen;
pGC->depth = pDrawable->depth;
pGC->pScreen = pScreen;
pGC->depth = depth;
pGC->alu = GXcopy; /* dst <- src */
pGC->planemask = ~0;
pGC->serialNumber = GC_CHANGE_SERIAL_BIT;
pGC->serialNumber = 0;
pGC->funcs = 0;
pGC->fgPixel = 0;
pGC->bgPixel = 1;
......@@ -496,17 +485,8 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
pGC->arcMode = ArcPieSlice;
pGC->tile.pixel = 0;
pGC->tile.pixmap = NullPixmap;
if (mask & GCForeground) {
/*
* magic special case -- ChangeGC checks for this condition
* and snags the Foreground value to create a pseudo default-tile
*/
pGC->tileIsPixel = FALSE;
}
else {
pGC->tileIsPixel = TRUE;
}
pGC->tileIsPixel = TRUE;
pGC->patOrg.x = 0;
pGC->patOrg.y = 0;
pGC->subWindowMode = ClipByChildren;
......@@ -521,12 +501,49 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
/* use the default font and stipple */
pGC->font = defaultFont;
defaultFont->refcnt++;
if (pGC->font) /* necessary, because open of default font could fail */
pGC->font->refcnt++;
pGC->stipple = pGC->pScreen->PixmapPerDepth[0];
pGC->stipple->refcnt++;
if (pGC->stipple)
pGC->stipple->refcnt++;
/* this is not a scratch GC */
pGC->scratch_inuse = FALSE;
return pGC;
}
/* CreateGC(pDrawable, mask, pval, pStatus)
creates a default GC for the given drawable, using mask to fill
in any non-default values.
Returns a pointer to the new GC on success, NULL otherwise.
returns status of non-default fields in pStatus
BUG:
should check for failure to create default tile
*/
GCPtr
CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
XID gcid, ClientPtr client)
{
GCPtr pGC;
pGC = NewGCObject(pDrawable->pScreen, pDrawable->depth);
if (!pGC) {
*pStatus = BadAlloc;
return (GCPtr) NULL;
}
pGC->serialNumber = GC_CHANGE_SERIAL_BIT;
if (mask & GCForeground) {
/*
* magic special case -- ChangeGC checks for this condition
* and snags the Foreground value to create a pseudo default-tile
*/
pGC->tileIsPixel = FALSE;
}
else {
pGC->tileIsPixel = TRUE;
}
/* security creation/labeling check */
*pStatus = XaceHook(XACE_RESOURCE_ACCESS, client, gcid, RT_GC, pGC,
......@@ -784,45 +801,10 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
{
GCPtr pGC;
pGC = dixAllocateObjectWithPrivates(GC, PRIVATE_GC);
pGC = NewGCObject(pScreen, depth);
if (!pGC)
return (GCPtr) NULL;
pGC->pScreen = pScreen;
pGC->depth = depth;
pGC->alu = GXcopy; /* dst <- src */
pGC->planemask = ~0;
pGC->serialNumber = 0;
pGC->fgPixel = 0;
pGC->bgPixel = 1;
pGC->lineWidth = 0;
pGC->lineStyle = LineSolid;
pGC->capStyle = CapButt;
pGC->joinStyle = JoinMiter;
pGC->fillStyle = FillSolid;
pGC->fillRule = EvenOddRule;
pGC->arcMode = ArcPieSlice;
pGC->font = defaultFont;
if (pGC->font) /* necessary, because open of default font could fail */
pGC->font->refcnt++;
pGC->tileIsPixel = TRUE;
pGC->tile.pixel = 0;
pGC->tile.pixmap = NullPixmap;
pGC->stipple = NullPixmap;
pGC->patOrg.x = 0;
pGC->patOrg.y = 0;
pGC->subWindowMode = ClipByChildren;
pGC->graphicsExposures = TRUE;
pGC->clipOrg.x = 0;
pGC->clipOrg.y = 0;
pGC->clientClipType = CT_NONE;
pGC->dashOffset = 0;
pGC->numInDashList = 2;
pGC->dash = DefaultDash;
/* scratch GCs in the GCperDepth pool start off unused */
pGC->scratch_inuse = FALSE;
pGC->stateChanges = GCAllBits;
if (!(*pScreen->CreateGC) (pGC)) {
FreeGC(pGC, (XID) 0);
......
......@@ -209,7 +209,7 @@ main(int argc, char *argv[], char *envp[])
for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr pScreen = screenInfo.screens[i];
if (!CreateScratchPixmapsForScreen(i))
if (!CreateScratchPixmapsForScreen(pScreen))
FatalError("failed to create scratch pixmaps");
if (pScreen->CreateScreenResources &&
!(*pScreen->CreateScreenResources) (pScreen))
......@@ -322,10 +322,10 @@ main(int argc, char *argv[], char *envp[])
CloseDownEvents();
for (i = screenInfo.numScreens - 1; i >= 0; i--) {
FreeScratchPixmapsForScreen(i);
FreeScratchPixmapsForScreen(screenInfo.screens[i]);
FreeGCperDepth(i);
FreeDefaultStipple(i);
(*screenInfo.screens[i]->CloseScreen) (i, screenInfo.screens[i]);
(*screenInfo.screens[i]->CloseScreen) (screenInfo.screens[i]);
dixFreePrivates(screenInfo.screens[i]->devPrivates, PRIVATE_SCREEN);
free(screenInfo.screens[i]);
screenInfo.numScreens = i;
......
......@@ -84,23 +84,23 @@ FreeScratchPixmapHeader(PixmapPtr pPixmap)
}
Bool
CreateScratchPixmapsForScreen(int scrnum)
CreateScratchPixmapsForScreen(ScreenPtr pScreen)
{
unsigned int pixmap_size;
pixmap_size = sizeof(PixmapRec) + dixPrivatesSize(PRIVATE_PIXMAP);
screenInfo.screens[scrnum]->totalPixmapSize =
pScreen->totalPixmapSize =
BitmapBytePad(pixmap_size * 8);
/* let it be created on first use */
screenInfo.screens[scrnum]->pScratchPixmap = NULL;
pScreen->pScratchPixmap = NULL;
return TRUE;
}
void
FreeScratchPixmapsForScreen(int scrnum)
FreeScratchPixmapsForScreen(ScreenPtr pScreen)
{
FreeScratchPixmapHeader(screenInfo.screens[scrnum]->pScratchPixmap);
FreeScratchPixmapHeader(pScreen->pScratchPixmap);
}
/* callable by ddx */
......
......@@ -680,7 +680,7 @@ pReadmask is a pointer to the information describing the descriptors
that will be waited on.
</para>
<para>
In the sample server, pTimeout is a struct timeval **, and pReadmask is
In the sample server, pTimeout is a pointer, and pReadmask is
the address of the select() mask for reading.
</para>
<para>
......@@ -688,15 +688,14 @@ The DIX BlockHandler() iterates through the Screens, for each one calling
its BlockHandler. A BlockHandler is declared thus:
<blockquote>
<programlisting>
void xxxBlockHandler(nscreen, pbdata, pptv, pReadmask)
int nscreen;
pointer pbdata;
struct timeval ** pptv;
void xxxBlockHandler(pScreen, pTimeout, pReadmask)
ScreenPtr pScreen;
pointer pTimeout;
pointer pReadmask;
</programlisting>
</blockquote>
The arguments are the index of the Screen, the blockData field
of the Screen, and the arguments to the DIX BlockHandler().
The arguments are a pointer to the Screen, and the arguments to the
DIX BlockHandler().
</para>
<para>
Immediately after WaitForSomething returns from the
......@@ -721,15 +720,14 @@ The DIX WakeupHandler() calls each Screen's
WakeupHandler. A WakeupHandler is declared thus:
<blockquote>
<programlisting>
void xxxWakeupHandler(nscreen, pbdata, err, pReadmask)
int nscreen;
pointer pbdata;
void xxxWakeupHandler(pScreen, result, pReadmask)
ScreenPtr pScreen;
unsigned long result;
pointer pReadmask;
</programlisting>
</blockquote>
The arguments are the index of the Screen, the blockData field
of the Screen, and the arguments to the DIX WakeupHandler().
The arguments are the Screen, of the Screen, and the arguments to
the DIX WakeupHandler().
</para>
<para>
In addition to the per-screen BlockHandlers, any module may register
......@@ -1942,18 +1940,15 @@ FALSE.</para>
The scrInitProc should be of the following form:
<blockquote><programlisting>
Bool scrInitProc(iScreen, pScreen, argc, argv)
int iScreen;
Bool scrInitProc(pScreen, argc, argv)
ScreenPtr pScreen;
int argc;
char **argv;
</programlisting></blockquote>
iScreen is the index for this screen; 0 for the first one initialized,
1 for the second, etc. pScreen is the pointer to the screen's new
ScreenRec. argc and argv are as before. Your screen initialize
procedure should return TRUE upon success or FALSE if the screen
cannot be initialized (for instance, if the screen hardware does not
exist on this machine).</para>
pScreen is the pointer to the screen's new ScreenRec. argc and argv
are as before. Your screen initialize procedure should return TRUE
upon success or FALSE if the screen cannot be initialized (for
instance, if the screen hardware does not exist on this machine).</para>
<para>
This procedure must determine what actual device it is supposed to initialize.
If you have a different procedure for each screen, then it is no problem.
......
......@@ -704,11 +704,9 @@ exaCreateScreenResources(ScreenPtr pScreen)
}
static void
ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
ExaBlockHandler(ScreenPtr pScreen, pointer pTimeout,
pointer pReadmask)
{
ScreenPtr pScreen = screenInfo.screens[screenNum];
ExaScreenPriv(pScreen);
/* Move any deferred results from a software fallback to the driver pixmap */
......@@ -716,7 +714,7 @@ ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
unwrap(pExaScr, pScreen, BlockHandler);
(*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
(*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler);
/* The rest only applies to classic EXA */
......@@ -736,15 +734,13 @@ ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
}
static void
ExaWakeupHandler(int screenNum, pointer wakeupData, unsigned long result,
ExaWakeupHandler(ScreenPtr pScreen, unsigned long result,
pointer pReadmask)
{
ScreenPtr pScreen = screenInfo.screens[screenNum];
ExaScreenPriv(pScreen);
unwrap(pExaScr, pScreen, WakeupHandler);
(*pScreen->WakeupHandler) (screenNum, wakeupData, result, pReadmask);
(*pScreen->WakeupHandler) (pScreen, result, pReadmask);
wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler);
if (result == 0 && pExaScr->numOffscreenAvailable > 1) {
......@@ -762,7 +758,7 @@ ExaWakeupHandler(int screenNum, pointer wakeupData, unsigned long result,
* screen private, before calling down to the next CloseSccreen.
*/
static Bool
exaCloseScreen(int i, ScreenPtr pScreen)
exaCloseScreen(ScreenPtr pScreen)
{
ExaScreenPriv(pScreen);
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
......@@ -797,7 +793,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
free(pExaScr);
return (*pScreen->CloseScreen) (i, pScreen);
return (*pScreen->CloseScreen) (pScreen);
}
/**
......
......@@ -789,7 +789,7 @@ extern _X_EXPORT void
ExaOffscreenMarkUsed(PixmapPtr pPixmap);
extern _X_EXPORT void
exaEnableDisableFBAccess(int index, Bool enable);
exaEnableDisableFBAccess(ScreenPtr pScreen, Bool enable);
extern _X_EXPORT Bool
exaDrawableIsOffscreen(DrawablePtr pDrawable);
......
......@@ -360,10 +360,8 @@ ExaOffscreenSwapIn(ScreenPtr pScreen)
* swapped out.
*/
void
exaEnableDisableFBAccess(int index, Bool enable)
exaEnableDisableFBAccess(ScreenPtr pScreen, Bool enable)
{
ScreenPtr pScreen = screenInfo.screens[index];
ExaScreenPriv(pScreen);
if (pExaScr->info->flags & EXA_HANDLES_PIXMAPS)
......
......@@ -147,7 +147,7 @@ typedef struct _ExaMigrationRec {
RegionPtr pReg;
} ExaMigrationRec, *ExaMigrationPtr;
typedef void (*EnableDisableFBAccessProcPtr) (int, Bool);
typedef void (*EnableDisableFBAccessProcPtr) (ScreenPtr, Bool);
typedef struct {
ExaDriverPtr info;
ScreenBlockHandlerProcPtr SavedBlockHandler;
......
......@@ -1419,7 +1419,7 @@ fbPushPixels(GCPtr pGC,
*/
extern _X_EXPORT Bool
fbCloseScreen(int indx, ScreenPtr pScreen);
fbCloseScreen(ScreenPtr pScreen);
extern _X_EXPORT Bool
fbRealizeFont(ScreenPtr pScreen, FontPtr pFont);
......
......@@ -81,7 +81,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
}
Bool
fbOverlayCloseScreen(int iScreen, ScreenPtr pScreen)
fbOverlayCloseScreen(ScreenPtr pScreen)
{
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
int i;
......
......@@ -63,7 +63,7 @@ extern _X_EXPORT Bool
fbOverlayCreateWindow(WindowPtr pWin);
extern _X_EXPORT Bool
fbOverlayCloseScreen(int iScreen, ScreenPtr pScreen);
fbOverlayCloseScreen(ScreenPtr pScreen);
extern _X_EXPORT int
fbOverlayWindowLayer(WindowPtr pWin);
......
......@@ -27,7 +27,7 @@
#include "fb.h"
Bool
fbCloseScreen(int index, ScreenPtr pScreen)
fbCloseScreen(ScreenPtr pScreen)
{
int d;
DepthPtr depths = pScreen->allowedDepths;
......
......@@ -846,18 +846,17 @@ static const __DRIextension *loader_extensions[] = {
};
static Bool
glxDRIEnterVT(int index, int flags)
glxDRIEnterVT(ScrnInfoPtr scrn)
{
ScrnInfoPtr scrn = xf86Screens[index];
Bool ret;
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);
glxGetScreen(xf86ScrnToScreen(scrn));
LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
scrn->EnterVT = screen->enterVT;
ret = scrn->EnterVT(index, flags);
ret = scrn->EnterVT(scrn);
screen->enterVT = scrn->EnterVT;
scrn->EnterVT = glxDRIEnterVT;
......@@ -871,18 +870,17 @@ glxDRIEnterVT(int index, int flags)
}
static void
glxDRILeaveVT(int index, int flags)
glxDRILeaveVT(ScrnInfoPtr scrn)
{
ScrnInfoPtr scrn = xf86Screens[index];
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);
glxGetScreen(xf86ScrnToScreen(scrn));
LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
glxSuspendClients();
scrn->LeaveVT = screen->leaveVT;
(*screen->leaveVT) (index, flags);
(*screen->leaveVT) (scrn);
screen->leaveVT = scrn->LeaveVT;
scrn->LeaveVT = glxDRILeaveVT;
}
......
......@@ -587,18 +587,17 @@ static const __DRIextension *loader_extensions[] = {
};
static Bool
glxDRIEnterVT(int index, int flags)
glxDRIEnterVT(ScrnInfoPtr scrn)
{
ScrnInfoPtr scrn = xf86Screens[index];
Bool ret;
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);
glxGetScreen(xf86ScrnToScreen(scrn));
LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
scrn->EnterVT = screen->enterVT;
ret = scrn->EnterVT(index, flags);
ret = scrn->EnterVT(scrn);
screen->enterVT = scrn->EnterVT;
scrn->EnterVT = glxDRIEnterVT;
......@@ -612,18 +611,17 @@ glxDRIEnterVT(int index, int flags)
}
static void
glxDRILeaveVT(int index, int flags)
glxDRILeaveVT(ScrnInfoPtr scrn)
{
ScrnInfoPtr scrn = xf86Screens[index];
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);