All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/mesa3d: allow selecting GLX platform
Date: Sun, 23 Feb 2020 11:08:19 +0100	[thread overview]
Message-ID: <20200223100819.GM8743@scaer> (raw)
In-Reply-To: <20200212221616.53785-1-james.hilliard1@gmail.com>

James, All,

On 2020-02-12 15:16 -0700, James Hilliard spake thusly:
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

Sorry, but this commit needs a bit more explanations.

Besides, we've recently applied some fixes that change the dependency
chains of EGL vs. GBM vs. DRI.

So, can you rebase your change on-top of master, check everything is
still OK, and expand on the commit log, please?

Regards,
Yann E. MORIN.

> ---
>  package/mesa3d/Config.in | 36 ++++++++++++++++++++++++++++++++++++
>  package/mesa3d/mesa3d.mk |  6 ++++++
>  2 files changed, 42 insertions(+)
> 
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index dbfc59bad5..b8b8451bbd 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -414,8 +414,40 @@ config BR2_PACKAGE_MESA3D_OPENGL_GLX
>  comment "OpenGL GLX support needs X11"
>  	depends on !BR2_PACKAGE_XORG7
>  
> +if BR2_PACKAGE_MESA3D_OPENGL_GLX
> +
> +choice
> +	prompt "GLX platform"
> +
> +config BR2_PACKAGE_MESA3D_OPENGL_GLX_DRI
> +	bool "dri"
> +
> +config BR2_PACKAGE_MESA3D_OPENGL_GLX_XLIB
> +	bool "xlib"
> +	depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER
> +
> +comment "xlib conflicts with any mesa3d dri drivers"
> +	depends on BR2_PACKAGE_MESA3D_DRI_DRIVER
> +
> +config BR2_PACKAGE_MESA3D_OPENGL_GLX_GALLIUM_XLIB
> +	bool "gallium-xlib"
> +	depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER
> +	depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
> +	depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
> +
> +comment "gallium-xlib conflicts with any mesa3d dri drivers and requires gallium w/ swrast"
> +	depends on BR2_PACKAGE_MESA3D_DRI_DRIVER || \
> +		!BR2_PACKAGE_MESA3D_GALLIUM_DRIVER || \
> +		!BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
> +
> +endchoice
> +
> +endif
> +
>  config BR2_PACKAGE_MESA3D_OPENGL_EGL
>  	bool "OpenGL EGL"
> +	depends on !BR2_PACKAGE_MESA3D_OPENGL_GLX || \
> +		BR2_PACKAGE_MESA3D_OPENGL_GLX_DRI
>  	select BR2_PACKAGE_HAS_LIBEGL
>  	select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
>  	select BR2_PACKAGE_MESA3D_GBM
> @@ -423,6 +455,10 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL
>  	  Use the Khronos EGL APIs. EGL is a window manager for OpenGL
>  	  applications similar to GLX, for X, and WGL, for Windows.
>  
> +comment "OpenGL EGL is incompatible w/ non-dri GLX platforms"
> +	depends on BR2_PACKAGE_MESA3D_OPENGL_GLX
> +	depends on !BR2_PACKAGE_MESA3D_OPENGL_GLX_DRI
> +
>  config BR2_PACKAGE_MESA3D_OPENGL_ES
>  	bool "OpenGL ES"
>  	select BR2_PACKAGE_HAS_LIBGLES
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index c14716bf15..a853454e05 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -57,7 +57,13 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y)
>  #  dri          : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi
>  #  xlib         : xlib conflicts with any dri driver
>  #  gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver.
> +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX_DRI),y)
>  MESA3D_CONF_OPTS += -Dglx=dri
> +else ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX_XLIB),y)
> +MESA3D_CONF_OPTS += -Dglx=xlib
> +else ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX_GALLIUM_XLIB),y)
> +MESA3D_CONF_OPTS += -Dglx=gallium-xlib
> +endif
>  ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y)
>  MESA3D_CONF_OPTS += -Dgallium-xa=true
>  else
> -- 
> 2.20.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

      reply	other threads:[~2020-02-23 10:08 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-12 22:16 [Buildroot] [PATCH 1/1] package/mesa3d: allow selecting GLX platform James Hilliard
2020-02-23 10:08 ` Yann E. MORIN [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200223100819.GM8743@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.