From 85310e912c5a2fc542618a11b9e38ea9c433ed18 Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Wed, 13 Aug 2025 02:27:16 +0800
Subject: [PATCH] Revert "glsl: Work around MSVC arm64 optimizer bug"

This reverts commit 86b5c9278ccc2ce3e660142915f9b1c9c5a33c09.

As bug https://developercommunity.visualstudio.com/t/Incorrect-ARM64-codegen-with-optimizatio/10564605

is fixed in VS 17.8.6

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36767>
---
 src/compiler/glsl/linker_util.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/compiler/glsl/linker_util.cpp b/src/compiler/glsl/linker_util.cpp
index 2f938637cdb..80f21081d2e 100644
--- a/src/compiler/glsl/linker_util.cpp
+++ b/src/compiler/glsl/linker_util.cpp
@@ -285,10 +285,6 @@ link_util_check_subroutine_resources(struct gl_shader_program *prog)
    }
 }
 
-#if defined(_MSC_VER) && DETECT_ARCH_AARCH64
-// Work around https://developercommunity.visualstudio.com/t/Incorrect-ARM64-codegen-with-optimizatio/10564605
-#pragma optimize("", off)
-#endif
 /**
  * Validate uniform resources used by a program versus the implementation limits
  */
@@ -368,9 +364,6 @@ link_util_check_uniform_resources(const struct gl_constants *consts,
       }
    }
 }
-#if defined(_MSC_VER) && DETECT_ARCH_AARCH64
-#pragma optimize("", on)
-#endif
 
 void
 link_util_calculate_subroutine_compat(struct gl_shader_program *prog)