From e9b9610d4580f95a987674c44c01bbf54932c23b Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 6 Feb 2026 12:58:48 +0100
Subject: [PATCH] dri2: declare variables where needed in dri2_copy_region()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/dri2/dri2.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/Xext/dri2/dri2.c b/Xext/dri2/dri2.c
index 307bc377dd..e70d46b04a 100644
--- a/Xext/dri2/dri2.c
+++ b/Xext/dri2/dri2.c
@@ -869,11 +869,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);
@@ -882,17 +879,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);
     }
 }