From 149694a52ea971027079bdbf0d971f5eb7cb2ddc Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 21 Apr 2022 15:13:09 -0400 Subject: [PATCH] wgl: support GL 4.6 somehow we never supported anything above 4.5? cc: mesa-stable Reviewed-by: Jesse Natalie Part-of: (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 d5f6a58d83d..e15a45e30f3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -156,7 +156,7 @@ "description": "wgl: support GL 4.6", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "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) ||