[Mesa-stable] 17.2: Revert f33d8af7aa354d00808f8bfd55028c396c706635

[Marek Olšák]

On Fri, Jul 28, 2017 at 7:26 PM, Tomasz Figa <tfiga at chromium.org> wrote:
> On Sat, Jul 29, 2017 at 2:19 AM, Marek Olšák <maraeo at gmail.com> wrote:
>> On Fri, Jul 28, 2017 at 6:52 PM, Tomasz Figa <tfiga at chromium.org> wrote:
>>> Hi Marek,
>>>
>>> On Fri, Jul 28, 2017 at 11:58 PM, Marek Olšák <maraeo at gmail.com> wrote:
>>>> Hi,
>>>>
>>>> Please revert f33d8af7aa354d00808f8bfd55028c396c706635 in 17.2.
>>>>
>>>> It exposes almost 500 new GLX visuals that we don't want, which may break GLX.
>>>
>>> Couldn't we just fix it up both on master and 17.2 by adding #ifdef
>>> ANDROID (or similar), instead of breaking Android again?
>>
>> The commit is too risky for 17.2, because nobody bothered to test the
>> new GLX visuals. It would be safer to revert it. #ifdef would also
>> work, but the correct fix for master is here:
>> https://patchwork.freedesktop.org/patch/169443/
>
> On the other hand, 17.2.0-rc1 has a working Android, which will be
> lost after the revert, while these new GLX visuals are not even known
> to cause problems yet. I'd still recommend the ifdef so that we can
> keep both worlds happy.

Well, you can send a patch adding the #ifdef.

>
> As for the fix for master, I like the idea of capability, but the
> patch misses the fact that droid_dri2_loader_extension is only used
> for DRI control nodes and for DRI render nodes
> droid_image_loader_extension is used.

I'll update that.

Marek