hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-22 01:20:26 +00:00
Code Issues Projects Releases Wiki Activity

Rearrange EXA driver structures so that there's a hope of maintaining ABI

Browse source 
when extending the driver interface. The card and accel structures are
    merged into the ExaDriverRec, which is to be allocated using
    exaDriverAlloc(). The driver structure also grows exa_major and
    exa_minor, which drivers fill in and have checked by EXA
    (double-checking that the driver really did check that the EXA version
    was correct). Removes exaInitCard(), which is replaced by the driver
    filling in the rec by hand, and the exaGetVersion() and related
    EXA_*VERSION which are replaced by always using the XFree86 loadable
    module versioning.
This commit is contained in:
Eric Anholt 2006-03-09 06:04:07 +00:00
commit 2822cbc1fb
10 changed files with 319 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/kdrive/ephyr/ephyr.h
View file

@ -47,7 +47,7 @@ typedef struct _ephyrPriv {
} EphyrPriv;
typedef struct _ephyrFakexaPriv {
ExaDriverRec exa;
ExaDriverPtr exa;
Bool is_synced;
/* The following are arguments and other information from Prepare* calls

64
hw/kdrive/ephyr/ephyr_draw.c
View file

@ -281,6 +281,11 @@ ephyrDrawInit(ScreenPtr pScreen)
if (fakexa == NULL)
return FALSE;
fakexa->exa = exaDriverAlloc();
if (fakexa->exa == NULL) {
xfree(fakexa);
return FALSE;
}
#if 0
/* Currently, EXA isn't ready for what we want to do here. We want one
* pointer to the framebuffer (which is set in exaMapFramebuffer) to be
@ -289,53 +294,60 @@ ephyrDrawInit(ScreenPtr pScreen)
* to extend the XImage data area set up in hostx.c from exaMapFramebuffer,
* but that may be complicated.
*/
fakexa->exa.card.memoryBase = xalloc(EPHYR_OFFSCREEN_SIZE);
if (fakexa->exa.card.memoryBase == NULL) {
fakexa->exa->memoryBase = xalloc(EPHYR_OFFSCREEN_SIZE);
if (fakexa->exa->memoryBase == NULL) {
xfree(fakexa->exa);
xfree(fakexa);
return FALSE;
}
fakexa->exa.card.memorySize = EPHYR_OFFSCREEN_SIZE;
fakexa->exa.card.offScreenBase = EPHYR_OFFSCREEN_BASE;
fakexa->exa->memorySize = EPHYR_OFFSCREEN_SIZE;
fakexa->exa->offScreenBase = EPHYR_OFFSCREEN_BASE;
#else
/* Tell EXA that there's a single framebuffer area, which happens to cover
* exactly what the front buffer is.
*/
fakexa->exa.card.memoryBase = screen->memory_base;
fakexa->exa.card.memorySize = screen->off_screen_base;
fakexa->exa.card.offScreenBase = screen->off_screen_base;
fakexa->exa->memoryBase = screen->memory_base;
fakexa->exa->memorySize = screen->off_screen_base;
fakexa->exa->offScreenBase = screen->off_screen_base;
#endif
fakexa->exa.accel.PrepareSolid = ephyrPrepareSolid;
fakexa->exa.accel.Solid = ephyrSolid;
fakexa->exa.accel.DoneSolid = ephyrDoneSolid;
/* Since we statically link against EXA, we shouldn't have to be smart about
* versioning.
*/
fakexa->exa->exa_major = 2;
fakexa->exa->exa_minor = 0;
fakexa->exa.accel.PrepareCopy = ephyrPrepareCopy;
fakexa->exa.accel.Copy = ephyrCopy;
fakexa->exa.accel.DoneCopy = ephyrDoneCopy;
fakexa->exa->PrepareSolid = ephyrPrepareSolid;
fakexa->exa->Solid = ephyrSolid;
fakexa->exa->DoneSolid = ephyrDoneSolid;
fakexa->exa.accel.CheckComposite = ephyrCheckComposite;
fakexa->exa.accel.PrepareComposite = ephyrPrepareComposite;
fakexa->exa.accel.Composite = ephyrComposite;
fakexa->exa.accel.DoneComposite = ephyrDoneComposite;
fakexa->exa->PrepareCopy = ephyrPrepareCopy;
fakexa->exa->Copy = ephyrCopy;
fakexa->exa->DoneCopy = ephyrDoneCopy;
fakexa->exa.accel.MarkSync = ephyrMarkSync;
fakexa->exa.accel.WaitMarker = ephyrWaitMarker;
fakexa->exa->CheckComposite = ephyrCheckComposite;
fakexa->exa->PrepareComposite = ephyrPrepareComposite;
fakexa->exa->Composite = ephyrComposite;
fakexa->exa->DoneComposite = ephyrDoneComposite;
fakexa->exa.card.pixmapOffsetAlign = EPHYR_OFFSET_ALIGN;
fakexa->exa.card.pixmapPitchAlign = EPHYR_PITCH_ALIGN;
fakexa->exa->MarkSync = ephyrMarkSync;
fakexa->exa->WaitMarker = ephyrWaitMarker;
fakexa->exa.card.maxX = 1023;
fakexa->exa.card.maxY = 1023;
fakexa->exa->pixmapOffsetAlign = EPHYR_OFFSET_ALIGN;
fakexa->exa->pixmapPitchAlign = EPHYR_PITCH_ALIGN;
fakexa->exa.card.flags = EXA_OFFSCREEN_PIXMAPS;
fakexa->exa->maxX = 1023;
fakexa->exa->maxY = 1023;
success = exaDriverInit(pScreen, &fakexa->exa);
fakexa->exa->flags = EXA_OFFSCREEN_PIXMAPS;
success = exaDriverInit(pScreen, fakexa->exa);
if (success) {
ErrorF("Initialized fake EXA acceleration\n");
scrpriv->fakexa = fakexa;
} else {
ErrorF("Failed to initialize EXA\n");
xfree(fakexa->exa.card.memoryBase);
xfree(fakexa->exa);
xfree(fakexa);
}