From a63c86d46391c02a19312e18fd78959d1dfd6208 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 5 Feb 2026 17:12:56 +0100
Subject: [PATCH] dri2: declare variables when needed in DRI2GetScreen()

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

diff --git a/Xext/dri2/dri2.c b/Xext/dri2/dri2.c
index 30acaf12a5..e928981aa5 100644
--- a/Xext/dri2/dri2.c
+++ b/Xext/dri2/dri2.c
@@ -190,17 +190,15 @@ DRI2GetScreen(ScreenPtr pScreen)
 static ScreenPtr
 GetScreenPrime(ScreenPtr primary, int prime_id)
 {
-    ScreenPtr secondary;
-    if (prime_id == 0) {
+    if (prime_id == 0)
         return primary;
-    }
-    xorg_list_for_each_entry(secondary, &primary->secondary_list, secondary_head) {
-        DRI2ScreenPtr ds;
 
+    ScreenPtr secondary;
+    xorg_list_for_each_entry(secondary, &primary->secondary_list, secondary_head) {
         if (!secondary->is_offload_secondary)
             continue;
 
-        ds = DRI2GetScreen(secondary);
+        DRI2ScreenPtr ds = DRI2GetScreen(secondary);
         if (ds == NULL)
             continue;