Module: Mesa Branch: master Commit: 044acd3569cbe689712be3c35544ceb7da4e5347 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=044acd3569cbe689712be3c35544ceb7da4e5347
Author: Andres Gomez <ago...@igalia.com> Date: Fri Mar 2 15:25:32 2018 +0200 dri_util: when overriding, always reset the core version 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 <ian.d.roman...@intel.com> Cc: Tapani Pälli <tapani.pa...@intel.com> Cc: Marek Olšák <marek.ol...@amd.com> Signed-off-by: Andres Gomez <ago...@igalia.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> --- 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 a34f38d611..3f780d155b 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; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit