[Mesa-dev,2/2] configure.ac: enable building the EGL DRM platform by default

Submitted by Marek Olšák on May 26, 2015, 10:57 a.m.

Details

Message ID 1432637845-6705-2-git-send-email-maraeo@gmail.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Marek Olšák May 26, 2015, 10:57 a.m.
From: Marek Olšák <marek.olsak@amd.com>

This is required by radeonsi.

The code was moved because with_egl_platforms was used before
the default was set.
---
 configure.ac | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Patch hide | download patch | download mbox

diff --git a/configure.ac b/configure.ac
index 84b404e..dbe590f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -763,6 +763,16 @@  AC_ARG_ENABLE([egl],
         [disable EGL library @<:@default=enabled@:>@])],
     [enable_egl="$enableval"],
     [enable_egl=yes])
+AC_ARG_WITH([egl-platforms],
+    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
+        [comma delimited native platforms libEGL supports, e.g.
+        "x11,drm" @<:@default=auto@:>@])],
+    [with_egl_platforms="$withval"],
+    [if test "x$enable_egl" = xyes; then
+	with_egl_platforms="x11,drm"
+    else
+	with_egl_platforms=""
+    fi])
 
 AC_ARG_ENABLE([xa],
     [AS_HELP_STRING([--enable-xa],
@@ -1732,17 +1742,6 @@  AC_SUBST([EGL_CLIENT_APIS])
 dnl
 dnl EGL Platforms configuration
 dnl
-AC_ARG_WITH([egl-platforms],
-    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
-        [comma delimited native platforms libEGL supports, e.g.
-        "x11,drm" @<:@default=auto@:>@])],
-    [with_egl_platforms="$withval"],
-    [if test "x$enable_egl" = xyes; then
-	with_egl_platforms="x11"
-    else
-	with_egl_platforms=""
-    fi])
-
 if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
     AC_MSG_ERROR([cannot build egl state tracker without EGL library])
 fi

Comments

Reviewed-by: Matt Turner <mattst88@gmail.com>
On 26/05/15 10:57, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak@amd.com>
> 
> This is required by radeonsi.
> 
> The code was moved because with_egl_platforms was used before
> the default was set.
> ---
>  configure.ac | 21 ++++++++++-----------
>  1 file changed, 10 insertions(+), 11 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 84b404e..dbe590f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -763,6 +763,16 @@ AC_ARG_ENABLE([egl],
>          [disable EGL library @<:@default=enabled@:>@])],
>      [enable_egl="$enableval"],
>      [enable_egl=yes])
> +AC_ARG_WITH([egl-platforms],
> +    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
> +        [comma delimited native platforms libEGL supports, e.g.
> +        "x11,drm" @<:@default=auto@:>@])],
> +    [with_egl_platforms="$withval"],
> +    [if test "x$enable_egl" = xyes; then
> +	with_egl_platforms="x11,drm"
> +    else
> +	with_egl_platforms=""
> +    fi])
>  
Can we just add drm without moving the hole hunk ? From a vague look it
should just work.

Thanks
Emil
No, it doesn't work. If I just add "drm" to the defaults and not use
--with-egl-platforms in the terminal, it fails with the message that
radeonsi requires drm. :)

Marek

On Tue, May 26, 2015 at 10:30 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> On 26/05/15 10:57, Marek Olšák wrote:
>> From: Marek Olšák <marek.olsak@amd.com>
>>
>> This is required by radeonsi.
>>
>> The code was moved because with_egl_platforms was used before
>> the default was set.
>> ---
>>  configure.ac | 21 ++++++++++-----------
>>  1 file changed, 10 insertions(+), 11 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 84b404e..dbe590f 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -763,6 +763,16 @@ AC_ARG_ENABLE([egl],
>>          [disable EGL library @<:@default=enabled@:>@])],
>>      [enable_egl="$enableval"],
>>      [enable_egl=yes])
>> +AC_ARG_WITH([egl-platforms],
>> +    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
>> +        [comma delimited native platforms libEGL supports, e.g.
>> +        "x11,drm" @<:@default=auto@:>@])],
>> +    [with_egl_platforms="$withval"],
>> +    [if test "x$enable_egl" = xyes; then
>> +     with_egl_platforms="x11,drm"
>> +    else
>> +     with_egl_platforms=""
>> +    fi])
>>
> Can we just add drm without moving the hole hunk ? From a vague look it
> should just work.
>
> Thanks
> Emil
Hmm

./autogen.sh --with-gallium-drivers=radeonsi --enable-egl --enable-gbm

seems to work fine here. Although... if I drop the --enable-gbm it
complains "EGL platform drm needs gbm", which is an entirely different
kettle of fish.

Fwiw I would opt to just enable gbm on supported platforms (everything
but Win/Mac) and then add drm to the list, based on --enable-gbm. If you
don't comfortable with it, I'll send patches as with follow up commit(s).

Cheers,
Emil

On 26/05/15 21:46, Marek Olšák wrote:
> No, it doesn't work. If I just add "drm" to the defaults and not use
> --with-egl-platforms in the terminal, it fails with the message that
> radeonsi requires drm. :)
> 
> Marek
> 
> On Tue, May 26, 2015 at 10:30 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote:
>> On 26/05/15 10:57, Marek Olšák wrote:
>>> From: Marek Olšák <marek.olsak@amd.com>
>>>
>>> This is required by radeonsi.
>>>
>>> The code was moved because with_egl_platforms was used before
>>> the default was set.
>>> ---
>>>  configure.ac | 21 ++++++++++-----------
>>>  1 file changed, 10 insertions(+), 11 deletions(-)
>>>
>>> diff --git a/configure.ac b/configure.ac
>>> index 84b404e..dbe590f 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -763,6 +763,16 @@ AC_ARG_ENABLE([egl],
>>>          [disable EGL library @<:@default=enabled@:>@])],
>>>      [enable_egl="$enableval"],
>>>      [enable_egl=yes])
>>> +AC_ARG_WITH([egl-platforms],
>>> +    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
>>> +        [comma delimited native platforms libEGL supports, e.g.
>>> +        "x11,drm" @<:@default=auto@:>@])],
>>> +    [with_egl_platforms="$withval"],
>>> +    [if test "x$enable_egl" = xyes; then
>>> +     with_egl_platforms="x11,drm"
>>> +    else
>>> +     with_egl_platforms=""
>>> +    fi])
>>>
>> Can we just add drm without moving the hole hunk ? From a vague look it
>> should just work.
>>
>> Thanks
>> Emil
On Wed, May 27, 2015 at 3:21 AM, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> Hmm
>
> ./autogen.sh --with-gallium-drivers=radeonsi --enable-egl --enable-gbm
>
> seems to work fine here. Although... if I drop the --enable-gbm it
> complains "EGL platform drm needs gbm", which is an entirely different
> kettle of fish.

I think I saw a radeonsi error, but I don't use --enable-egl and
--enable-gbm. Ideally, --with-egl-platforms=xxx should enable EGL and
--with-egl-platforms= should disable it.

>
> Fwiw I would opt to just enable gbm on supported platforms (everything
> but Win/Mac) and then add drm to the list, based on --enable-gbm. If you
> don't comfortable with it, I'll send patches as with follow up commit(s).

Yes, please.

Thanks,

Marek