On 2 March 2018 at 13:25, Andres Gomez <[email protected]> wrote: > 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 <[email protected]> > Cc: Tapani Pälli <[email protected]> > Cc: Marek Olšák <[email protected]> > Signed-off-by: Andres Gomez <[email protected]> > --- > 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; > - } > } > This patch restores the original pre-464c56d3d5c behaviour + the 464c56d3d5c commit message does not mention the change. It'll be great if Ian can confirm if it was intentional, but patch makes perfect sense IMHO.
Reviewed-by: Emil Velikov <[email protected]> -Emil _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
