[Mesa-dev] [PATCH v2 1/3] mesa: actually support compat profile creation with MESA_GL_VERSION_OVERRIDE

[Timothy Arceri]

---
 src/mesa/drivers/dri/common/dri_util.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 7cb6248b130..d72f72d0756 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -389,10 +389,11 @@ driCreateContextAttribs(__DRIscreen *screen, int api,
         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 &&
-                ctx_config.minor_version >= 2))) {
+    if (mesa_api == API_OPENGL_COMPAT &&
+        ((ctx_config.major_version > 3) || (ctx_config.major_version == 3 &&
+                                            ctx_config.minor_version >= 2)) &&
+        !((ctx_config.major_version * 10 + ctx_config.minor_version) <=
+          screen->max_gl_compat_version)) {
        *error = __DRI_CTX_ERROR_BAD_API;
        return NULL;
     }
-- 
2.17.0