[Mesa-dev] [PATCH] dri_util: when overriding, always reset the core version

[Tapani Pälli]

Hi;

On 03/02/2018 03:25 PM, Andres Gomez 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.

Do I understand correctly that this happens because when version asked 
is > 3.2 then we always do core context, even when overriding to compat 
profile?

Assuming it's OK to have both __DRI_API_OPENGL and __DRI_API_OPENGL_CORE 
in api_mask;

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

> 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.romanick at intel.com>
> Cc: Tapani Pälli <tapani.palli at intel.com>
> Cc: Marek Olšák <marek.olsak at amd.com>
> Signed-off-by: Andres Gomez <agomez at igalia.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 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;
>