Reviewed-by: Marek Olšák <[email protected]> Marek
On Sun, Mar 18, 2018 at 8:41 PM, Andres Gomez <[email protected]> wrote: > 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 <[email protected]> > Cc: Ian Romanick <[email protected]> > Cc: Kenneth Graunke <[email protected]> > Cc: Eric Engestrom <[email protected]> > Cc: Emil Velikov <[email protected]> > Signed-off-by: Andres Gomez <[email protected]> > Reviewed-by: Emil Velikov <[email protected]> > --- > 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 5eae34bf0df..a089d923ad7 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.16.1 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
