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

[Ilia Mirkin]

On Thu, Jan 21, 2016 at 1:43 PM, Ian Romanick <idr at freedesktop.org> wrote:
> On 01/21/2016 09:10 AM, Jose Fonseca wrote:
>> FWIW see
>>
>>   https://bugs.freedesktop.org/show_bug.cgi?id=92869
>>   http://cgit.freedesktop.org/~jrfonseca/mesa/commit/?h=es2_profile
>>
>> 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:
>
> Well, it's kind of nonsense.  It's like saying you support OpenGL 2.0
> but not 1.5.

So your suggestion is that we should merge __DRI_API_GLES3 with
__DRI_API_GLES2? I have no problem with that... when we do, we can get
rid of these uses of it as well.

  -ilia