From 3b2ed40250226dd076bfa4a7f827ad778facaaea Mon Sep 17 00:00:00 2001
From: Anthony Roberts <anthony.roberts@linaro.org>
Date: Tue, 12 Dec 2023 08:12:45 +0100
Subject: [PATCH] Windows: Remove workaround for ARM64/WSL Mesa drivers

This reverts #110582 - the workaround is no longer needed, as MS have updated
the version of mesa they ship as part of their compatibility pack, which contains
a workaround on that side instead.

This means that the supported version of OpenGL based on the host GPU is now
correct, bar `GL_ARB_texture_view`.

`GL_ARB_texture_view` is faked for ARM64 devices, as the part that is not
implemented (channel casting) is not used in blender.

This means that ARM64 devices (at least) now report compatibility up to OpenGL
4.6 in the system info export.

See: https://gitlab.freedesktop.org/mesa/mesa/-/commit/698344b93c49a9f3a257a0ef4546edf5cd3a9130

Pull Request: https://projects.blender.org/blender/blender/pulls/116052
---
 source/creator/creator.cc | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/source/creator/creator.cc b/source/creator/creator.cc
index 8b156720bfb..227908fede0 100644
--- a/source/creator/creator.cc
+++ b/source/creator/creator.cc
@@ -14,10 +14,6 @@
 #  include <windows.h>
 #endif
 
-#ifdef __linux__
-#  include <unistd.h>
-#endif
-
 #if defined(WITH_TBB_MALLOC) && defined(_MSC_VER) && defined(NDEBUG)
 #  pragma comment(lib, "tbbmalloc_proxy.lib")
 #  pragma comment(linker, "/include:__TBB_malloc_proxy")
@@ -29,7 +25,6 @@
 
 #include "DNA_genfile.h"
 
-#include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_system.h"
 #include "BLI_task.h"
@@ -334,19 +329,6 @@ int main(int argc,
 #  endif /* USE_WIN32_UNICODE_ARGS */
 #endif   /* WIN32 */
 
-/* Here we check for Windows ARM64 or WSL, and override the Mesa reported OpenGL version */
-#if defined(WIN32) || defined(__linux__)
-#  if defined(WIN32)
-  if (strncmp(BLI_getenv("PROCESSOR_IDENTIFIER"), "ARM", 3) == 0)
-#  else /* Must be linux, so check if we're in WSL */
-  if (access("/proc/sys/fs/binfmt_misc/WSLInterop", F_OK) == 0)
-#  endif
-  {
-    BLI_setenv_if_new("MESA_GLSL_VERSION_OVERRIDE", "430");
-    BLI_setenv_if_new("MESA_GL_VERSION_OVERRIDE", "4.3");
-  }
-#endif
-
   /* NOTE: Special exception for guarded allocator type switch:
    *       we need to perform switch from lock-free to fully
    *       guarded allocator before any allocation happened.