On 19 March 2018 at 00:41, Andres Gomez <ago...@igalia.com> wrote:
> From: Marek Olšák <marek.ol...@amd.com>
>
> v2:
> - Provide a correct explanation on the envvars documentation (Ian).
> - Provide a more correct explanation on the function comments (Andres).
>
> Fixes: 2599b92eb97 ("mesa: allow forcing >=3.1 compatibility contexts
> with MESA_GL_VERSION_OVERRIDE")
>
> Cc: Jordan Justen <jordan.l.jus...@intel.com>
> Cc: Ian Romanick <ian.d.roman...@intel.com>
> Cc: Eric Engestrom <eric.engest...@imgtec.com>
> Cc: Emil Velikov <emil.veli...@collabora.com>
> Signed-off-by: Andres Gomez <ago...@igalia.com>
> ---
> docs/envvars.html | 25 ++++++++++++++++++-------
> src/mesa/main/version.c | 23 +++++++++++------------
> 2 files changed, 29 insertions(+), 19 deletions(-)
>
> diff --git a/docs/envvars.html b/docs/envvars.html
> index ea42a50779b..7ec91a1fd91 100644
> --- a/docs/envvars.html
> +++ b/docs/envvars.html
> @@ -88,19 +88,30 @@ This is a work-around for that.
> <li>MESA_GL_VERSION_OVERRIDE - changes the value returned by
> glGetString(GL_VERSION) and possibly the GL API type.
> <ul>
> -<li> The format should be MAJOR.MINOR[FC]
> +<li> The format should be MAJOR.MINOR[FC|COMPAT]
> <li> FC is an optional suffix that indicates a forward compatible context.
> This is only valid for versions >= 3.0.
> -<li> GL versions < 3.0 are set to a compatibility (non-Core) profile
> -<li> GL versions = 3.0, see below
> -<li> GL versions > 3.0 are set to a Core profile
> -<li> Examples: 2.1, 3.0, 3.0FC, 3.1, 3.1FC
> +<li> COMPAT is an optional suffix that indicates a compatibility
> +context or GL_ARB_compatibility support. This is only valid for
> +versions >= 3.1.
> +<li> GL versions <= 3.0 are set to a compatibility (non-Core) profile
> +<li> GL versions = 3.1, depending on the driver, it may or may not
> +have the ARB_compatibility extension enabled.
> +<li> GL versions >= 3.2 are set to a Core profile
> +<li> Examples: 2.1, 3.0, 3.0FC, 3.1, 3.1FC, 3.1COMPAT, 3.2, 3.2FC, 3.2COMPAT
> <ul>
> <li> 2.1 - select a compatibility (non-Core) profile with GL version 2.1
> <li> 3.0 - select a compatibility (non-Core) profile with GL version 3.0
> <li> 3.0FC - select a Core+Forward Compatible profile with GL version 3.0
> -<li> 3.1 - select a Core profile with GL version 3.1
> -<li> 3.1FC - select a Core+Forward Compatible profile with GL version 3.1
> +<li> 3.1 - select OpenGL 3.1. GL_ARB_compatibility will be enabled per
> +the driver default.
> +<li> 3.1FC - select OpenGL 3.1 with forward compatibility
> +enabled. GL_ARB_compatibilty will not be enabled.
> +<li> 3.1COMPAT - select OpenGL 3.1 with GL_ARB_compatibilty forced
> +enabled.
> +<li> 3.2 - select a Core profile with GL version 3.2
> +<li> 3.2FC - select a Core+Forward Compatible profile with GL version 3.2
> +<li> 3.2COMPAT - select a compatibility (non-Core) profile with GL version
> 3.2
This hunk and the inline comment vary in small ways - can we just copy/paste?
The inline comments slightly better.
Also there seems to be a typo'd GL_ARB_compatibilty throughout.
Simple sed s/GL_ARB_compatibilty/GL_ARB_compatibility/ should do it.
With that
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
No need to resent - but if you want fire away. Just merge the other
reviewed patches, please?
-Emil
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
