summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/mesalib.in23
-rw-r--r--rules/mesalib.make1
2 files changed, 12 insertions, 12 deletions
diff --git a/rules/mesalib.in b/rules/mesalib.in
index bfd041d34..da151d6c3 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -44,10 +44,6 @@ if MESALIB
config MESALIB_UDEV
bool
-config MESALIB_GLX
- prompt "GLX library"
- bool
-
comment "Drivers"
config MESALIB_DRI_SWRAST
@@ -123,6 +119,7 @@ config MESALIB_OPENGL
config MESALIB_GLES1
bool
+ select MESALIB_OPENGL
prompt "OpenGL ES1"
config MESALIB_GLES2
@@ -130,7 +127,12 @@ config MESALIB_GLES2
select MESALIB_OPENGL
prompt "OpenGL ES2"
-if MESALIB_OPENGL || MESALIB_GLES1 || MESALIB_GLES2
+config MESALIB_GLX
+ select MESALIB_EGL_X11
+ select MESALIB_OPENGL
+ prompt "GLX"
+ bool
+
config MESALIB_EGL
bool
select MESALIB_UDEV
@@ -140,27 +142,24 @@ config MESALIB_GBM
bool
select MESALIB_UDEV
prompt "GBM"
-endif
-if MESALIB_EGL
-
-comment "EGL Platforms"
+comment "Platforms"
config MESALIB_EGL_X11
bool
- default MESALIB_GLX
+ prompt "X11"
config MESALIB_EGL_DRM
bool
select MESALIB_GBM
+ select MESALIB_EGL
prompt "DRM"
config MESALIB_EGL_WAYLAND
bool
+ select MESALIB_EGL
prompt "Wayland"
-endif
-
comment "Gallium HUD options"
config MESALIB_EXTENDED_HUD
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 5b5f06c6d..4cf31b34a 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -77,6 +77,7 @@ MESALIB_LIBS-$(PTXCONF_MESALIB_GLES2) += libGLESv2
MESALIB_LIBS-$(PTXCONF_MESALIB_EGL) += libEGL
MESALIB_LIBS-$(PTXCONF_MESALIB_GBM) += libgbm
+MESALIBS_EGL_PLATFORMS-y := surfaceless
MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11
MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_DRM) += drm
MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_WAYLAND) += wayland