diff --git a/.gitignore b/.gitignore
index 5949b9c..b262b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .sconsign.dblite
 bin/
 godot-mesa/
+*.pyc
diff --git a/.gitmodules b/.gitmodules
index 2351efa..98fd5e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "mesa"]
 	path = mesa
-	url = https://github.com/Mesa3D/mesa
+	url = https://gitlab.freedesktop.org/mesa/mesa
diff --git a/godot-patches/01_godot_nir_goodies.patch b/godot-patches/01_godot_nir_goodies.patch
index e0a17d9..a973143 100644
--- a/godot-patches/01_godot_nir_goodies.patch
+++ b/godot-patches/01_godot_nir_goodies.patch
@@ -718,14 +718,15 @@ index 245c5140f9..d6c9d06c30 100644
  }
  
  static const struct dxil_value *
-@@ -5079,6 +5083,11 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr)
+@@ -5079,6 +5083,12 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr)
     case nir_intrinsic_exclusive_scan:
        return emit_reduce(ctx, intr);
  
-+   case nir_intrinsic_load_constant_non_opt:
++   case nir_intrinsic_load_constant_non_opt: {
 +      const struct dxil_value* value = get_src(ctx, &intr->src[0], 0, nir_type_uint);
 +      store_dest_value(ctx, &intr->dest, 0, value);
 +      return true;
++   }
 +
     case nir_intrinsic_load_num_workgroups:
     case nir_intrinsic_load_workgroup_size:
diff --git a/godot-patches/02_Add_Curly_Braces_nir_to_dxil.c.patch b/godot-patches/02_Add_Curly_Braces_nir_to_dxil.c.patch
deleted file mode 100644
index 504e79a..0000000
--- a/godot-patches/02_Add_Curly_Braces_nir_to_dxil.c.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/godot-mesa/src/microsoft/compiler/nir_to_dxil.c b/godot-mesa/src/microsoft/compiler/nir_to_dxil.c
-index d6c9d06..1e8e9ea 100644
---- a/godot-mesa/src/microsoft/compiler/nir_to_dxil.c
-+++ b/godot-mesa/src/microsoft/compiler/nir_to_dxil.c
-@@ -5083,11 +5083,11 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr)
-    case nir_intrinsic_exclusive_scan:
-       return emit_reduce(ctx, intr);
- 
--   case nir_intrinsic_load_constant_non_opt:
-+   case nir_intrinsic_load_constant_non_opt: {
-       const struct dxil_value* value = get_src(ctx, &intr->src[0], 0, nir_type_uint);
-       store_dest_value(ctx, &intr->dest, 0, value);
-       return true;
--
-+   }
-    case nir_intrinsic_load_num_workgroups:
-    case nir_intrinsic_load_workgroup_size:
-    default:
diff --git a/godot-tools/__pycache__/windows.cpython-310.pyc b/godot-tools/__pycache__/windows.cpython-310.pyc
deleted file mode 100644
index d79c9e5..0000000
Binary files a/godot-tools/__pycache__/windows.cpython-310.pyc and /dev/null differ
diff --git a/godot-tools/__pycache__/windows.cpython-311.pyc b/godot-tools/__pycache__/windows.cpython-311.pyc
deleted file mode 100644
index 1f324b7..0000000
Binary files a/godot-tools/__pycache__/windows.cpython-311.pyc and /dev/null differ
diff --git a/godot-tools/windows.py b/godot-tools/windows.py
index 351dc57..7b9e498 100644
--- a/godot-tools/windows.py
+++ b/godot-tools/windows.py
@@ -23,8 +23,13 @@ def generate(env):
     if not env["use_mingw"] and msvc.exists(env):
         if env["arch"] == "x86_64":
             env["TARGET_ARCH"] = "amd64"
+        elif env["arch"] == "arm64":
+            env["TARGET_ARCH"] = "arm64"
+        elif env["arch"] == "arm32":
+            env["TARGET_ARCH"] = "arm"
         elif env["arch"] == "x86_32":
             env["TARGET_ARCH"] = "x86"
+
         env["is_msvc"] = True
 
         # MSVC, linker, and archiver.
@@ -63,7 +68,15 @@ def generate(env):
     else:
         env["use_mingw"] = True
         # Cross-compilation using MinGW
-        prefix = "i686" if env["arch"] == "x86_32" else env["arch"]
+        if env["arch"] == "x86_64":
+            prefix = "x86_64"
+        elif env["arch"] == "arm64":
+            prefix = "aarch64"
+        elif env["arch"] == "arm32":
+            prefix = "armv7"
+        elif env["arch"] == "x86_32":
+            prefix = "i686"
+
         if env["use_llvm"]:
             env["CXX"] = prefix + "-w64-mingw32-clang"
             env["CC"] = prefix + "-w64-mingw32-clang++"
diff --git a/mesa b/mesa
index 9085c9d..52ab558 160000
--- a/mesa
+++ b/mesa
@@ -1 +1 @@
-Subproject commit 9085c9d43e37c643ee9c9fb01b6184fa7c60bffd
+Subproject commit 52ab5584b870be041b93f702693ea3f5665df860