From 16f3e9cd76b65d6a767cbbac6219c8baff130b85 Mon Sep 17 00:00:00 2001
From: Jose Fonseca <jfonseca@vmware.com>
Date: Wed, 26 Apr 2023 10:08:58 +0100
Subject: [PATCH] wgl: Remove needless `if (1) { ... }`.

Noticed by Craig Scott on https://gitlab.freedesktop.org/mesa/mesa/-/issues/4427#note_857876

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
Reviewed-by: Neha Bhende <bhenden@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22706>
---
 src/gallium/frontends/wgl/stw_tls.c | 48 ++++++++++++++---------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/gallium/frontends/wgl/stw_tls.c b/src/gallium/frontends/wgl/stw_tls.c
index 2a5d3cea477..29a588366ec 100644
--- a/src/gallium/frontends/wgl/stw_tls.c
+++ b/src/gallium/frontends/wgl/stw_tls.c
@@ -74,35 +74,33 @@ stw_tls_init(void)
     * stw_tls_init_thread() call for it later on.
     */
 #ifndef _GAMING_XBOX
-   if (1) {
-      DWORD dwCurrentProcessId = GetCurrentProcessId();
-      DWORD dwCurrentThreadId = GetCurrentThreadId();
-      HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, dwCurrentProcessId);
-      if (hSnapshot != INVALID_HANDLE_VALUE) {
-         THREADENTRY32 te;
-         te.dwSize = sizeof te;
-         if (Thread32First(hSnapshot, &te)) {
-            do {
-               if (te.dwSize >= FIELD_OFFSET(THREADENTRY32, th32OwnerProcessID) +
-                                sizeof te.th32OwnerProcessID) {
-                  if (te.th32OwnerProcessID == dwCurrentProcessId) {
-                     if (te.th32ThreadID != dwCurrentThreadId) {
-                        struct stw_tls_data *data;
-                        data = stw_tls_data_create(te.th32ThreadID);
-                        if (data) {
-                           EnterCriticalSection(&g_mutex);
-                           data->next = g_pendingTlsData;
-                           g_pendingTlsData = data;
-                           LeaveCriticalSection(&g_mutex);
-                        }
+   DWORD dwCurrentProcessId = GetCurrentProcessId();
+   DWORD dwCurrentThreadId = GetCurrentThreadId();
+   HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, dwCurrentProcessId);
+   if (hSnapshot != INVALID_HANDLE_VALUE) {
+      THREADENTRY32 te;
+      te.dwSize = sizeof te;
+      if (Thread32First(hSnapshot, &te)) {
+         do {
+            if (te.dwSize >= FIELD_OFFSET(THREADENTRY32, th32OwnerProcessID) +
+                             sizeof te.th32OwnerProcessID) {
+               if (te.th32OwnerProcessID == dwCurrentProcessId) {
+                  if (te.th32ThreadID != dwCurrentThreadId) {
+                     struct stw_tls_data *data;
+                     data = stw_tls_data_create(te.th32ThreadID);
+                     if (data) {
+                        EnterCriticalSection(&g_mutex);
+                        data->next = g_pendingTlsData;
+                        g_pendingTlsData = data;
+                        LeaveCriticalSection(&g_mutex);
                      }
                   }
                }
-               te.dwSize = sizeof te;
-            } while (Thread32Next(hSnapshot, &te));
-         }
-         CloseHandle(hSnapshot);
+            }
+            te.dwSize = sizeof te;
+         } while (Thread32Next(hSnapshot, &te));
       }
+      CloseHandle(hSnapshot);
    }
 #endif /* _GAMING_XBOX */