diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-04-17 18:04:19 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-17 22:57:27 +0200 |
| commit | ca2176efaf76b62badae290aee3fd0e3567aeff5 (patch) | |
| tree | 9e76db8d0f42de2007d81c4a0e4e827015085d2d | |
| parent | dcec14b7f4c40b54dd19af3985fe65572c0291b1 (diff) | |
| download | buildroot-ca2176efaf76b62badae290aee3fd0e3567aeff5.tar.gz buildroot-ca2176efaf76b62badae290aee3fd0e3567aeff5.zip | |
package/mesa3d: simplify the code enabling full-OpenGL
Currently, full-OpenGL is enabled by checking that at least one driver
is enabled. This is done by checking that the just-constructed lists of
drivers are not empty.
But we already have a variable that is set to 'y' as soon as a driver
is selected:
- DRI drivers select BR2_PACKAGE_MESA3D_DRI_DRIVER
- Gallium drivers select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
- both BR2_PACKAGE_MESA3D_DRI_DRIVER and BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
select BR2_PACKAGE_MESA3D_DRIVER
So, BR2_PACKAGE_MESA3D_DRIVER is set to 'y' as soon as at least one
driver is selected. We can use that variable rather than comparing the
lists of drivers.
Also, rearrange the code in a more logical way, by moving the code that
enables OpenGL nearer to the code enabling EGL and GLES.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/mesa3d/mesa3d.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 1e2cc53aa9..0d41efa7bd 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -58,16 +58,6 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon -# at least one API is required, for buildroot enable OpenGL API by default -# other APIs (EGL, EGL_ES) are optional -ifeq ($(MESA3D_GALLIUM_DRIVERS-y)$(MESA3D_DRI_DRIVERS-y),) -MESA3D_CONF_OPT += \ - --disable-opengl -else -MESA3D_CONF_OPT += \ - --enable-opengl -endif - ifeq ($(MESA3D_GALLIUM_DRIVERS-y),) MESA3D_CONF_OPT += \ --without-gallium-drivers @@ -90,6 +80,14 @@ endif # APIs +# At least one API is required, for buildroot enable OpenGL API by default. +# Other APIs (EGL, EGL_ES) are optional +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) +MESA3D_CONF_OPT += --enable-opengl +else +MESA3D_CONF_OPT += --disable-opengl +endif + ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) # egl depends on gbm, gbm depends on udev MESA3D_DEPENDENCIES += udev |
