vectras-team/termux-x11
1
0
Fork 0
mirror of https://github.com/vectras-team/termux-x11.git synced 2024-11-23 06:41:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

A few dri3 fixes

Browse Source
This commit is contained in:
Twaik Yont 2024-04-09 19:51:43 +03:00
parent 27dba2abb2
commit 05bebd4c6f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/cpp/lorie/InitOutput.c
View File

@ -559,10 +559,10 @@ lorieScreenInit(ScreenPtr pScreen, unused int argc, unused char **argv) {
pScreen->whitePixel = 1;
if (FALSE
|| !lorieInitDri3(pScreen)
|| !miSetVisualTypesAndMasks(24, ((1 << TrueColor) | (1 << DirectColor)), 8, TrueColor, 0xFF0000, 0x00FF00, 0x0000FF)
|| !miSetPixmapDepths()
|| !fbScreenInit(pScreen, NULL, pvfb->root.width, pvfb->root.height, monitorResolution, monitorResolution, 0, 32)
|| !lorieInitDri3(pScreen)
|| !fbPictureInit(pScreen, 0, 0)
|| !lorieRandRInit(pScreen)
|| !miPointerInitialize(pScreen, &loriePointerSpriteFuncs, &loriePointerCursorFuncs, TRUE)

5
app/src/main/cpp/lorie/dri3.c
View File

@ -70,7 +70,7 @@ static Bool FalseNoop() { return FALSE; }
#define lorieGCPriv(pGC) LorieGCPrivPtr pGCPriv = dixLookupPrivate(&(pGC)->devPrivates, &lorieGCPrivateKey)
#define lorieScrPriv(pScr) LorieScrPrivPtr pScrPriv = ((LorieScrPrivPtr) dixLookupPrivate(&(pScr)->devPrivates, &lorieScrPrivateKey))
#define loriePixFromDrawable(pDrawable, suffix) \
PixmapPtr pDrawable ## Pix ## suffix = (pDrawable->class == DRAWABLE_PIXMAP) ? \
PixmapPtr pDrawable ## Pix ## suffix = (pDrawable->type == DRAWABLE_PIXMAP) ? \
(PixmapPtr) (((char*) pDrawable) - offsetof(PixmapRec, drawable)) : 0
#define loriePixPriv(pDrawable, suffix) \
LorieAHBPixPrivPtr pPixPriv ## suffix = (pDrawable ## Pix ## suffix) ? ((LorieAHBPixPrivPtr) \
@ -207,7 +207,7 @@ static RegionPtr lorieCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, in
if (!wasLocked) {
AHardwareBuffer_unlock(pPixPriv0->buffer, NULL);
pSrc->pScreen->ModifyPixmapHeader(pSrcPix0, 0, 0, 0, 0, 0, NULL);
pSrcPix0->devPrivate.ptr = NULL;
}
LORIE_GC_OP_EPILOGUE(pGC)
return r;
@ -517,6 +517,7 @@ static PixmapPtr loriePixmapFromFds(ScreenPtr screen, CARD8 num_fds, const int *
goto fail;
}
pixmap->devPrivate.ptr = NULL;
screen->ModifyPixmapHeader(pixmap, desc.width, desc.height, 0, 0, desc.stride * 4, NULL);
return pixmap;
}