wgl: Switch to Win10 version defines to enable usage of Win10 WGL callbacks

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6228>

diff --git a/meson.build b/meson.build
index 9bf889659a335792aa71b1e973d3df883b0fa36b..dba847b9f8593546d84861fb1f67a07f0655e512 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -932,7 +932,7 @@ elif host_machine.system() == 'sunos'
   pre_args += '-D__EXTENSIONS__'
 elif host_machine.system() == 'windows'
   pre_args += [
-    '-D_WINDOWS', '-D_WIN32_WINNT=0x0601', '-DWINVER=0x0601',
+    '-D_WINDOWS', '-D_WIN32_WINNT=0x0A00', '-DWINVER=0x0A00',
     '-DPIPE_SUBSYSTEM_WINDOWS_USER',
     '-D_USE_MATH_DEFINES',  # XXX: scons doesn't use this for mingw
   ]

diff --git a/scons/gallium.py b/scons/gallium.py
index ea212d15a95714356e3aa6c97faa9ce310f635cf..40903cd0cc9bade9d846f212b94297d680d05211 100755 (executable)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -399,8 +399,8 @@ def generate(env):
             #'_UNICODE',
             #'UNICODE',
             # http://msdn.microsoft.com/en-us/library/aa383745.aspx
-            ('_WIN32_WINNT', '0x0601'),
-            ('WINVER', '0x0601'),
+            ('_WIN32_WINNT', '0x0A00'),
+            ('WINVER', '0x0A00'),
         ]
         if gcc_compat:
             cppdefines += [('__MSVCRT_VERSION__', '0x0700')]