Mesa (staging/22.1): wgl: support GL 4.6

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: cbee0572eda956af41ba0c7e03386ee52d009f02
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbee0572eda956af41ba0c7e03386ee52d009f02

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Apr 21 15:13:09 2022 -0400

wgl: support GL 4.6

somehow we never supported anything above 4.5?

cc: mesa-stable

Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16085>
(cherry picked from commit f8f5b5455ae17160fb979c6a16f5304461333ad5)

---

 .pick_status.json                           | 2 +-
 src/gallium/frontends/wgl/stw_ext_context.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8322d33e8f8..eb56f524b63 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -454,7 +454,7 @@
         "description": "wgl: support GL 4.6",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/frontends/wgl/stw_ext_context.c b/src/gallium/frontends/wgl/stw_ext_context.c
index a549c8cd2c4..99665685357 100644
--- a/src/gallium/frontends/wgl/stw_ext_context.c
+++ b/src/gallium/frontends/wgl/stw_ext_context.c
@@ -133,7 +133,7 @@ wglCreateContextAttribsARB(HDC hDC, HGLRC hShareContext, const int *attribList)
         ((majorVersion == 1 && minorVersion > 5) ||
          (majorVersion == 2 && minorVersion > 1) ||
          (majorVersion == 3 && minorVersion > 3) ||
-         (majorVersion == 4 && minorVersion > 5) ||
+         (majorVersion == 4 && minorVersion > 6) ||
          majorVersion > 4)) ||
        (profileMask == WGL_CONTEXT_ES_PROFILE_BIT_EXT &&
         ((majorVersion == 1 && minorVersion > 1) ||