From: Pablo Correa Gómez Date: Fri, 27 May 2022 22:58:43 +0000 (+0200) Subject: glcontext-win32-wgl: Respect user required version, use display as minimum X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~4^2~145^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d4f8a80f2a3d1043a37a69c2302b8293b48a4165;p=gtk4.git glcontext-win32-wgl: Respect user required version, use display as minimum By setting and then getting the required version in a context, the code was not respecting user requirements. Instead, simply get the requested version by the user clipped by the requirements (display version) --- diff --git a/gdk/win32/gdkglcontext-win32-wgl.c b/gdk/win32/gdkglcontext-win32-wgl.c index 231f2a6a01..d7ff4367f2 100644 --- a/gdk/win32/gdkglcontext-win32-wgl.c +++ b/gdk/win32/gdkglcontext-win32-wgl.c @@ -548,17 +548,12 @@ gdk_win32_gl_context_wgl_realize (GdkGLContext *context, * wglCreateContextAttribsARB() may only give us the GL context version * that we ask for here, and nothing more. So, improve things here by * asking for the GL version that is reported to us via epoxy_gl_version(), - * rather than the default GL core 3.2 context. Save this up in our - * GdkGLContext so that subsequent contexts that are shared with this - * context are created likewise too. + * rather than the default GL core 3.2 context. */ - if (share != NULL) - gdk_gl_context_get_required_version (share, &major, &minor); - else - { - major = display_win32->gl_version / 10; - minor = display_win32->gl_version % 10; - } + gdk_gl_context_get_clipped_version (context, + display_win32->gl_version / 10, + display_win32->gl_version % 10, + &major, &minor); if (surface != NULL) hdc = GDK_WIN32_SURFACE (surface)->hdc; @@ -626,7 +621,6 @@ gdk_win32_gl_context_wgl_realize (GdkGLContext *context, /* Ensure that any other context is created with a legacy bit set */ gdk_gl_context_set_is_legacy (context, legacy_bit); - gdk_gl_context_set_required_version (context, major, minor); return GDK_GL_API_GL; }