From 044acd3569cbe689712be3c35544ceb7da4e5347 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Fri, 2 Mar 2018 15:25:32 +0200 Subject: [PATCH] dri_util: when overriding, always reset the core version MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This way we won't fail when validating just because we may have a non overriden core version that is lower than the requested one, even when the compat version is high enough. For example, running glcts from VK-GL-CTS with i965, this will succeed: $ MESA_GL_VERSION_OVERRIDE=4.6 ./glcts --deqp-case=KHR-GL46.info.vendor While, this will fail: $ MESA_GL_VERSION_OVERRIDE=4.6COMPAT ./glcts --deqp-case=KHR-GL46.info.vendor Fixes: 464c56d3d5c ("dri_util: Use _mesa_override_gl_version_contextless") Cc: Ian Romanick Cc: Tapani Pälli Cc: Marek Olšák Signed-off-by: Andres Gomez Reviewed-by: Emil Velikov Reviewed-by: Tapani Pälli --- src/mesa/drivers/dri/common/dri_util.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index a34f38d6114..3f780d155b8 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -164,11 +164,9 @@ driCreateNewScreen2(int scrn, int fd, api = API_OPENGL_COMPAT; if (_mesa_override_gl_version_contextless(&consts, &api, &version)) { - if (api == API_OPENGL_CORE) { - psp->max_gl_core_version = version; - } else { + psp->max_gl_core_version = version; + if (api == API_OPENGL_COMPAT) psp->max_gl_compat_version = version; - } } psp->api_mask = 0; -- 2.30.2