From c6067fcd0747c85dee333b9b5726fc7fec998c1b Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Sat, 3 Mar 2018 00:55:46 +0200 Subject: [PATCH] dri_util: don't fail when not supporting ARB_compatibility with GL3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Currently, any driver that does not support the ARB_compatibility extension will fail on GL3.1 context creation if the application does not request the forward-compatiblity flag. Restore the original check which changes mesa_api to API_OPENGL_CORE, only when: - GL3.1 is requested, without the forward-compatiblity flag. - driver does not support ARB_compatibility - as deduced by max_gl_compat_version. Fixes: a0c8b49284e ("mesa: enable OpenGL 3.1 with ARB_compatibility") v2: - Improve commit log (Emil). - Provide a correct explanation on the features documentation (Ian). Cc: Marek Olšák Cc: Ian Romanick Cc: Kenneth Graunke Cc: Eric Engestrom Cc: Emil Velikov Signed-off-by: Andres Gomez Reviewed-by: Emil Velikov Reviewed-by: Marek Olšák --- docs/features.txt | 11 +++++++---- src/mesa/drivers/dri/common/dri_util.c | 10 ++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/docs/features.txt b/docs/features.txt index 8f003ddd90b..b1eb9e91a2a 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -24,10 +24,13 @@ not started # OpenGL Core and Compatibility context support -Some drivers do not support the Compatibility profile or ARB_compatibility. -Such drivers are limited to OpenGL 3.0 if the Core profile is not requested -by applications. Some of the later GL features are exposed in the 3.0 context -as extensions. +Some drivers do not support the Compatibility profile or the +ARB_compatibility extensions. If an application does not request a +specific version without the forward-compatiblity flag, such drivers +will be limited to OpenGL 3.0. If an application requests OpenGL 3.1, +it will get a context that may or may not have the ARB_compatibility +extension enabled. Some of the later GL features are exposed in the 3.0 +context as extensions. Feature Status diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 3f780d155b8..0b94d19fa5d 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -379,6 +379,16 @@ driCreateContextAttribs(__DRIscreen *screen, int api, } } + /* The specific Mesa driver may not support the GL_ARB_compatibilty + * extension or the compatibility profile. In that case, we treat an + * API_OPENGL_COMPAT 3.1 as API_OPENGL_CORE. We reject API_OPENGL_COMPAT + * 3.2+ in any case. + */ + if (mesa_api == API_OPENGL_COMPAT && + ctx_config.major_version == 3 && ctx_config.minor_version == 1 && + screen->max_gl_compat_version < 31) + mesa_api = API_OPENGL_CORE; + if (mesa_api == API_OPENGL_COMPAT && ((ctx_config.major_version > 3) || (ctx_config.major_version == 3 && -- 2.30.2