[Mesa-dev] [PATCH v2] glx: update to updated version of EXT_create_context_es2_profile

[Ilia Mirkin]

On Thu, Jan 21, 2016 at 12:10 PM, Jose Fonseca <jfonseca at vmware.com> wrote:
> FWIW see
>
>   https://bugs.freedesktop.org/show_bug.cgi?id=92869
>   http://cgit.freedesktop.org/~jrfonseca/mesa/commit/?h=es2_profile
>

Ah, I was unaware of your prior work. FWIW I also sent an X server
patch, and Adam Jackson fixed it up and sent a more complete version.

>
> On 21/01/16 16:58, Ilia Mirkin wrote:
>>
>> The EXT spec has been updated to:
>>   - logically combine the es2_profile and es_profile exts
>>   - allow any legal version to be requested
>>
>> dEQP tests request a specific ES version when using GLX, so this allows
>> dEQP upstream to run against GLX with the appropriate X server patch
>> (which had similar disabling logic).
>>
>> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
>> Reviewed-by: Matt Turner <mattst88 at gmail.com> (v1)
>>
>> v1 -> v2:
>>   - distinguish between DRI_API_GLES{,2,3}
>>   - add GLX_EXT_create_context_es_profile client-side support
>> ---
>>   src/glx/dri2_glx.c      | 11 ++++++++---
>>   src/glx/dri3_glx.c      |  7 ++++++-
>>   src/glx/dri_common.c    | 28 ++++++++++++----------------
>>   src/glx/drisw_glx.c     |  4 +++-
>>   src/glx/glxextensions.c |  1 +
>>   src/glx/glxextensions.h |  1 +
>>   6 files changed, 31 insertions(+), 21 deletions(-)
>>
>> diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
>> index 651915a..97bf49c 100644
>> --- a/src/glx/dri2_glx.c
>> +++ b/src/glx/dri2_glx.c
>> @@ -1102,9 +1102,14 @@ dri2BindExtensions(struct dri2_screen *psc, struct
>> glx_display * priv,
>>         __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context");
>>         __glXEnableDirectExtension(&psc->base,
>> "GLX_ARB_create_context_profile");
>>
>> -      if ((mask & (1 << __DRI_API_GLES2)) != 0)
>> -        __glXEnableDirectExtension(&psc->base,
>> -                                   "GLX_EXT_create_context_es2_profile");
>> +      if ((mask & (1 << (__DRI_API_GLES |
>> +                         __DRI_API_GLES2 |
>> +                         __DRI_API_GLES3))) != 0) {
>
>
> I recalled Ian Romanick's review saying that supporting GLES3 without GLES2
> was not a good idea:
>
>  http://lists.freedesktop.org/archives/mesa-dev/2015-April/082010.html

If that's the case, __DRI_API_GLES3 should be removed. When it is,
this code can also be updated. It's all mostly theoretical, since in
practice no mesa driver will set __DRI_API_GLES3 without also setting
GLES2.

If you'd prefer your patches get merged, that's fine with me, but I do
want to get something in so that we can actually run dEQP without
patching it to request a 2.0 context.

Cheers,

  -ilia