Skip to content

dri2: declare variables where needed in dri2_copy_region() #1974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
metux merged 1 commit into from
Feb 10, 2026
Merged

dri2: declare variables where needed in dri2_copy_region() #1974

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions Xext/dri2/dri2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,11 +892,8 @@ static void dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
DRI2BufferPtr pDest, DRI2BufferPtr pSrc)
{
DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
DRI2ScreenPtr ds;
ScreenPtr primeScreen;

primeScreen = GetScreenPrime(pDraw->pScreen, pPriv->prime_id);
ds = DRI2GetScreen(primeScreen);
ScreenPtr primeScreen = GetScreenPrime(pDraw->pScreen, pPriv->prime_id);
DRI2ScreenPtr ds = DRI2GetScreen(primeScreen);

if (ds->CopyRegion2)
(*ds->CopyRegion2)(primeScreen, pDraw, pRegion, pDest, pSrc);
Expand All @@ -905,17 +902,16 @@ static void dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,

/* cause damage to the box */
if (pPriv->prime_id) {
BoxRec box;
RegionRec region;
box.x1 = 0;
box.x2 = box.x1 + pDraw->width;
box.y1 = 0;
box.y2 = box.y1 + pDraw->height;
RegionInit(&region, &box, 1);
RegionTranslate(&region, pDraw->x, pDraw->y);
DamageRegionAppend(pDraw, &region);
DamageRegionProcessPending(pDraw);
RegionUninit(&region);
BoxRec box = {
.x2 = pDraw->width,
.y2 = pDraw->height,
};
RegionRec region;
RegionInit(&region, &box, 1);
RegionTranslate(&region, pDraw->x, pDraw->y);
DamageRegionAppend(pDraw, &region);
DamageRegionProcessPending(pDraw);
RegionUninit(&region);
}
}

Expand Down