fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-08 07:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hack the DRI module to accept PIXMAPs.

Browse source 
For glucose use only.
This commit is contained in:
Alan Hourihane 2007-03-27 13:30:14 +01:00
parent bd07acb187
commit 71ee3e7c48
2 changed files with 173 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

186
hw/xfree86/dri/dri.c
View file

@ -79,6 +79,7 @@ extern Bool noPanoramiXExtension;
static int DRIScreenPrivIndex = -1;
static int DRIWindowPrivIndex = -1;
static int DRIPixmapPrivIndex = -1;
static unsigned long DRIGeneration = 0;
static unsigned int DRIDrawableValidationStamp = 0;
@ -616,6 +617,12 @@ DRIExtensionInit(void)
*/
if ((DRIWindowPrivIndex = AllocateWindowPrivateIndex()) < 0)
return FALSE;
/* Allocate a pixmap private index with a zero sized private area for
* each pixmap, then should a pixmap become a DRI pixmap, we'll hang
* a DRIPixmapPrivateRec off of this private index.
*/
if ((DRIPixmapPrivIndex = AllocatePixmapPrivateIndex()) < 0)
return FALSE;
DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete);
DRIContextPrivResType = CreateNewResourceType(DRIContextPrivDelete);
@ -625,6 +632,8 @@ DRIExtensionInit(void)
pScreen = screenInfo.screens[i];
if (!AllocateWindowPrivate(pScreen, DRIWindowPrivIndex, 0))
return FALSE;
if (!AllocatePixmapPrivate(pScreen, DRIPixmapPrivIndex, 0))
return FALSE;
}
RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);
@ -1102,10 +1111,9 @@ DRICreateDrawable(ScreenPtr pScreen, Drawable id,
{
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
DRIDrawablePrivPtr pDRIDrawablePriv;
WindowPtr pWin;
if (pDrawable->type == DRAWABLE_WINDOW) {
pWin = (WindowPtr)pDrawable;
WindowPtr pWin = (WindowPtr)pDrawable;
if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
pDRIDrawablePriv->refCount++;
@ -1154,9 +1162,47 @@ DRICreateDrawable(ScreenPtr pScreen, Drawable id,
*hHWDrawable = pDRIDrawablePriv->hwDrawable;
}
}
else { /* pixmap (or for GLX 1.3, a PBuffer) */
/* NOT_DONE */
return FALSE;
else if (pDrawable->type == DRAWABLE_PIXMAP) {
PixmapPtr pPixmap = (PixmapPtr)pDrawable;
if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPixmap))) {
pDRIDrawablePriv->refCount++;
if (!pDRIDrawablePriv->hwDrawable) {
drmCreateDrawable(pDRIPriv->drmFD, &pDRIDrawablePriv->hwDrawable);
}
}
else {
/* allocate a DRI Window Private record */
if (!(pDRIDrawablePriv = xalloc(sizeof(DRIDrawablePrivRec)))) {
return FALSE;
}
/* Only create a drm_drawable_t once */
if (drmCreateDrawable(pDRIPriv->drmFD,
&pDRIDrawablePriv->hwDrawable)) {
xfree(pDRIDrawablePriv);
return FALSE;
}
/* add it to the list of DRI drawables for this screen */
pDRIDrawablePriv->pScreen = pScreen;
pDRIDrawablePriv->refCount = 1;
pDRIDrawablePriv->drawableIndex = -1;
pDRIDrawablePriv->nrects = 1;
/* save private off of preallocated index */
pPixmap->devPrivates[DRIPixmapPrivIndex].ptr =
(pointer)pDRIDrawablePriv;
/* track this in case this window is destroyed */
AddResource(id, DRIDrawablePrivResType, (pointer)pPixmap);
}
if (pDRIDrawablePriv->hwDrawable)
*hHWDrawable = pDRIDrawablePriv->hwDrawable;
}
else { /* for GLX 1.3, a PBuffer */
return FALSE;
}
return TRUE;
@ -1166,11 +1212,9 @@ Bool
DRIDestroyDrawable(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable)
{
DRIDrawablePrivPtr pDRIDrawablePriv;
WindowPtr pWin;
if (pDrawable->type == DRAWABLE_WINDOW) {
pWin = (WindowPtr)pDrawable;
WindowPtr pWin = (WindowPtr)pDrawable;
pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
pDRIDrawablePriv->refCount--;
if (pDRIDrawablePriv->refCount <= 0) {
@ -1178,6 +1222,15 @@ DRIDestroyDrawable(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable)
FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
}
}
else if (pDrawable->type == DRAWABLE_PIXMAP) {
PixmapPtr pPixmap = (PixmapPtr)pDrawable;
pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPixmap);
pDRIDrawablePriv->refCount--;
if (pDRIDrawablePriv->refCount <= 0) {
/* This calls back DRIDrawablePrivDelete which frees private area */
FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
}
}
else { /* pixmap (or for GLX 1.3, a PBuffer) */
/* NOT_DONE */
return FALSE;
@ -1192,10 +1245,9 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
DrawablePtr pDrawable = (DrawablePtr)pResource;
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen);
DRIDrawablePrivPtr pDRIDrawablePriv;
WindowPtr pWin;
if (pDrawable->type == DRAWABLE_WINDOW) {
pWin = (WindowPtr)pDrawable;
WindowPtr pWin = (WindowPtr)pDrawable;
pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
if (pDRIDrawablePriv->drawableIndex != -1) {
@ -1220,7 +1272,28 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
if (REGION_NUM_RECTS(&pWin->clipList))
DRIDecreaseNumberVisible(pDrawable->pScreen);
}
else { /* pixmap (or for GLX 1.3, a PBuffer) */
else if (pDrawable->type == DRAWABLE_PIXMAP) {
PixmapPtr pPixmap = (PixmapPtr)pDrawable;
pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPixmap);
if (pDRIDrawablePriv->drawableIndex != -1) {
/* bump stamp to force outstanding 3D requests to resync */
pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
= DRIDrawableValidationStamp++;
/* release drawable table entry */
pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;
}
if (drmDestroyDrawable(pDRIPriv->drmFD,
pDRIDrawablePriv->hwDrawable)) {
return FALSE;
}
xfree(pDRIDrawablePriv);
pPixmap->devPrivates[DRIPixmapPrivIndex].ptr = NULL;
}
else { /* or for GLX 1.3, a PBuffer */
/* NOT_DONE */
return FALSE;
}
@ -1246,7 +1319,6 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
{
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
DRIDrawablePrivPtr pDRIDrawablePriv, pOldDrawPriv;
WindowPtr pWin, pOldWin;
int i;
#if 0
@ -1254,7 +1326,8 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
#endif
if (pDrawable->type == DRAWABLE_WINDOW) {
pWin = (WindowPtr)pDrawable;
WindowPtr pOldWin;
WindowPtr pWin = (WindowPtr)pDrawable;
if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
/* Manage drawable table */
@ -1387,7 +1460,92 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
return FALSE;
}
}
else { /* pixmap (or for GLX 1.3, a PBuffer) */
else if (pDrawable->type == DRAWABLE_PIXMAP) {
PixmapPtr pOldPixmap;
PixmapPtr pPixmap = (PixmapPtr)pDrawable;
if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPixmap))) {
/* Manage drawable table */
if (pDRIDrawablePriv->drawableIndex == -1) { /* load SAREA table */
/* Search table for empty entry */
i = 0;
while (i < pDRIPriv->pDriverInfo->maxDrawableTableEntry) {
if (!(pDRIPriv->DRIDrawables[i])) {
pDRIPriv->DRIDrawables[i] = pDrawable;
pDRIDrawablePriv->drawableIndex = i;
pDRIPriv->pSAREA->drawableTable[i].stamp =
DRIDrawableValidationStamp++;
break;
}
i++;
}
/* Search table for oldest entry */
if (i == pDRIPriv->pDriverInfo->maxDrawableTableEntry) {
unsigned int oldestStamp = ~0;
int oldestIndex = 0;
i = pDRIPriv->pDriverInfo->maxDrawableTableEntry;
while (i--) {
if (pDRIPriv->pSAREA->drawableTable[i].stamp <
oldestStamp) {
oldestIndex = i;
oldestStamp =
pDRIPriv->pSAREA->drawableTable[i].stamp;
}
}
pDRIDrawablePriv->drawableIndex = oldestIndex;
/* release oldest drawable table entry */
pOldPixmap = (PixmapPtr)pDRIPriv->DRIDrawables[oldestIndex];
pOldDrawPriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pOldPixmap);
pOldDrawPriv->drawableIndex = -1;
/* claim drawable table entry */
pDRIPriv->DRIDrawables[oldestIndex] = pDrawable;
/* validate SAREA entry */
pDRIPriv->pSAREA->drawableTable[oldestIndex].stamp =
DRIDrawableValidationStamp++;
/* check for stamp wrap around */
if (oldestStamp > DRIDrawableValidationStamp) {
/* walk SAREA table and invalidate all drawables */
for( i=0;
i < pDRIPriv->pDriverInfo->maxDrawableTableEntry;
i++) {
pDRIPriv->pSAREA->drawableTable[i].stamp =
DRIDrawableValidationStamp++;
}
}
}
}
*index = pDRIDrawablePriv->drawableIndex;
*stamp = pDRIPriv->pSAREA->drawableTable[*index].stamp;
*X = (int)(pPixmap->drawable.x);
*Y = (int)(pPixmap->drawable.y);
*W = (int)(pPixmap->drawable.width);
*H = (int)(pPixmap->drawable.height);
/* use pixmap clip rect */
pDRIPriv->fullscreen_rect.x1 = *X;
pDRIPriv->fullscreen_rect.y1 = *Y;
pDRIPriv->fullscreen_rect.x2 = *X + *W;
pDRIPriv->fullscreen_rect.y2 = *Y + *H;
*numClipRects = 1;
*pClipRects = &pDRIPriv->fullscreen_rect;
/* Use the frontbuffer cliprects for back buffers. */
*numBackClipRects = 0;
*pBackClipRects = NULL;
}
else {
/* Not a DRIDrawable */
return FALSE;
}
}
else { /* (or for GLX 1.3, a PBuffer) */
/* NOT_DONE */
return FALSE;
}

2
hw/xfree86/dri/dristruct.h
View file

@ -45,7 +45,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) \
((DRIPixmapPrivIndex < 0) ? \
NULL : \
((DRIDrawablePrivPtr)((pPix)->devPrivates[DRIWindowPrivIndex].ptr)))
((DRIDrawablePrivPtr)((pPix)->devPrivates[DRIPixmapPrivIndex].ptr)))
typedef struct _DRIDrawablePrivRec
{