Enable Broadcom and software rasterizer Vulkan drivers.
Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
rules/host-mesalib.make | 3 +++
rules/mesalib.in | 9 +++++++++
rules/mesalib.make | 11 ++++++++---
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index 77244eb73bfa..fb2d2b18b3ad 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -28,6 +28,7 @@ HOST_MESALIB_CONF_OPT := \
-Ddri3=disabled \
-Degl=disabled \
-Degl-lib-suffix= \
+ -Dfreedreno-kgsl=false \
-Dgallium-drivers= \
-Dgallium-extra-hud=false \
-Dgallium-nine=false \
@@ -59,10 +60,12 @@ HOST_MESALIB_CONF_OPT := \
-Dpower8=disabled \
-Dprefer-iris=true \
-Dselinux=false \
+ -Dshader-cache-default=true \
-Dshader-cache=disabled \
-Dshared-glapi=enabled \
-Dshared-llvm=disabled \
-Dshared-swr=true \
+ -Dstatic-libclc=[] \
-Dswr-arches=[] \
-Dtools=glsl \
-Dva-libs-path=/usr/lib/dri \
diff --git a/rules/mesalib.in b/rules/mesalib.in
index ccf218dab5a3..09eb6fa37de8 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -191,6 +191,10 @@ config MESALIB_VULKAN_AMD
depends on BROKEN
prompt "AMD (Radv)"
+config MESALIB_VULKAN_BROADCOM
+ bool
+ prompt "Broadcom"
+
config MESALIB_VULKAN_INTEL
bool
prompt "Intel (Anvil)"
@@ -199,6 +203,11 @@ config MESALIB_VULKAN_FREEDRENO
bool
prompt "Freedreno (Turnip)"
+config MESALIB_VULKAN_SWRAST
+ bool
+ select MESALIB_DRI_SWRAST
+ prompt "Software Rasterizer"
+
config MESALIB_ZSTD
bool
prompt "use Zstandard for shader cache compression"
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 706d27b076fb..7b27773846d1 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 20.2.3
-MESALIB_MD5 := 8d73d6eb479d392d2fe20f02ccbe44e0
+MESALIB_VERSION := 20.3.0
+MESALIB_MD5 := 37f5acdb20ef781e7ffdeba0495f46c1
MESALIB := mesa-$(MESALIB_VERSION)
MESALIB_SUFFIX := tar.xz
MESALIB_URL := \
@@ -90,10 +90,12 @@ MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD)
+= amd
MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL) += intel
endif
ifdef PTXCONF_ARCH_ARM
+MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_BROADCOM) += broadcom
MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_FREEDRENO) += freedreno
endif
+MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_SWRAST) +=
swrast
-MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(MESALIB_VULKAN_DRIVERS-y))
+MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(subst
swrast,lvp,$(MESALIB_VULKAN_DRIVERS-y)))
MESALIB_LIBS-y := libglapi
MESALIB_LIBS-$(PTXCONF_MESALIB_GLX) += libGL
@@ -118,6 +120,7 @@ MESALIB_CONF_OPT := \
-Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \
-Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \
-Degl-lib-suffix= \
+ -Dfreedreno-kgsl=false \
-Dgallium-drivers=$(subst
$(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
-Dgallium-extra-hud=$(call ptx/truefalse, PTXCONF_MESALIB_EXTENDED_HUD)
\
-Dgallium-nine=false \
@@ -149,10 +152,12 @@ MESALIB_CONF_OPT := \
-Dpower8=disabled \
-Dprefer-iris=true \
-Dselinux=false \
+ -Dshader-cache-default=true \
-Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_VULKAN_AMD)d \
-Dshared-glapi=enabled \
-Dshared-llvm=disabled \
-Dshared-swr=true \
+ -Dstatic-libclc=[] \
-Dswr-arches=[] \
-Dtools=[] \
-Dva-libs-path=/usr/lib/dri \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
