https://docs.mesa3d.org/relnotes/25.3.0.html https://docs.mesa3d.org/relnotes/25.3.1.html
Signed-off-by: Philipp Zabel <[email protected]> --- rules/host-mesalib.in | 4 ++++ rules/host-mesalib.make | 14 ++++++++++++-- rules/mesalib.in | 20 ++++++++++++++++++++ rules/mesalib.make | 24 ++++++++++++++++++------ 4 files changed, 54 insertions(+), 8 deletions(-) diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in index 0e3c4b2f2b8f..9cb212a4d6d5 100644 --- a/rules/host-mesalib.in +++ b/rules/host-mesalib.in @@ -9,6 +9,7 @@ config HOST_MESALIB select HOST_MAKEDEPEND select HOST_MESON select HOST_LIBDRM if HOST_MESALIB_PANFROST + select HOST_SPIRV_TOOLS if HOST_MESALIB_CLC select HOST_SYSTEM_PYTHON3 select HOST_SYSTEM_PYTHON3_MAKO select HOST_SYSTEM_PYTHON3_PYYAML @@ -25,4 +26,7 @@ config HOST_MESALIB_PANFROST config HOST_MESALIB_ASAHI bool +config HOST_MESALIB_IMAGINATION + bool + endif diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make index 744bf1a670a0..84f4753e0b40 100644 --- a/rules/host-mesalib.make +++ b/rules/host-mesalib.make @@ -18,6 +18,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESALIB) += host-mesalib HOST_MESALIB_TOOLS-y := glsl HOST_MESALIB_TOOLS-$(PTXCONF_HOST_MESALIB_PANFROST) += panfrost HOST_MESALIB_TOOLS-$(PTXCONF_HOST_MESALIB_ASAHI) += asahi +HOST_MESALIB_TOOLS-$(PTXCONF_HOST_MESALIB_IMAGINATION) += imagination HOST_MESALIB_MESON_CROSS_FILE := $(call ptx/get-alternative, config/meson, mesalib-native-file.meson) @@ -29,6 +30,7 @@ HOST_MESALIB_CONF_OPT := \ -Damd-use-llvm=false \ -Damdgpu-virtio=false \ -Dandroid-libbacktrace=disabled \ + -Dandroid-libperfetto=disabled \ -Dandroid-strict=true \ -Dandroid-stub=false \ -Dbuild-aco-tests=false \ @@ -37,6 +39,7 @@ HOST_MESALIB_CONF_OPT := \ -Dcustom-shader-replacement= \ -Dd3d-drivers-path=/usr/lib/d3d \ -Ddatasources=auto \ + -Ddisplay-info=disabled \ -Ddraw-use-llvm=false \ -Ddri-drivers-path=/usr/lib/dri \ -Degl=disabled \ @@ -56,7 +59,6 @@ HOST_MESALIB_CONF_OPT := \ -Dgallium-rusticl=false \ -Dgallium-rusticl-enable-drivers= \ -Dgallium-va=disabled \ - -Dgallium-vdpau=disabled \ -Dgallium-wgl-dll-name=libgallium_wgl \ -Dgbm=disabled \ -Dgbm-backends-path= \ @@ -72,6 +74,7 @@ HOST_MESALIB_CONF_OPT := \ -Dhtml-docs=disabled \ -Dhtml-docs-path= \ -Dimagination-srv=false \ + -Dimagination-uscgen-devices=[] \ -Dinstall-intel-gpu-tests=false \ -Dinstall-mesa-clc=$(call ptx/truefalse, PTXCONF_HOST_MESALIB_CLC) \ -Dinstall-precomp-compiler=true \ @@ -102,6 +105,7 @@ HOST_MESALIB_CONF_OPT := \ -Dshader-cache-max-size=1G \ -Dshared-llvm=disabled \ -Dspirv-to-dxil=false \ + -Dspirv-tools=$(call ptx/endis, PTXCONF_HOST_MESALIB_CLC)d \ -Dsplit-debug=disabled \ -Dsse2=true \ -Dstatic-libclc=[] \ @@ -111,7 +115,6 @@ HOST_MESALIB_CONF_OPT := \ -Dunversion-libgallium=false \ -Dva-libs-path=/usr/lib/dri \ -Dvalgrind=disabled \ - -Dvdpau-libs-path=/usr/lib/vdpau \ -Dvideo-codecs=[] \ -Dvirtgpu_kumquat=false \ -Dvmware-mks-stats=false \ @@ -141,6 +144,10 @@ ifdef PTXCONF_HOST_MESALIB_ASAHI HOST_MESALIB_MAKE_OPT += \ src/asahi/clc/asahi_clc endif +ifdef PTXCONF_HOST_MESALIB_IMAGINATION +HOST_MESALIB_MAKE_OPT += \ + src/imagination/pco/uscgen/pco_clc +endif $(STATEDIR)/host-mesalib.install: @$(call targetinfo) @@ -154,6 +161,9 @@ ifdef PTXCONF_HOST_MESALIB_PANFROST endif ifdef PTXCONF_HOST_MESALIB_ASAHI install -D -m755 $(HOST_MESALIB_DIR)-build/src/asahi/clc/asahi_clc $(HOST_MESALIB_PKGDIR)/usr/bin/asahi_clc +endif +ifdef PTXCONF_HOST_MESALIB_IMAGINATION + install -D -m755 $(HOST_MESALIB_DIR)-build/src/imagination/pco/uscgen/pco_clc $(HOST_MESALIB_PKGDIR)/usr/bin/pco_clc endif @$(call touch) diff --git a/rules/mesalib.in b/rules/mesalib.in index 45c83843ef7c..5dbc76638889 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -7,6 +7,7 @@ menuconfig MESALIB select HOST_MESALIB_CLC if MESALIB_CLC select HOST_MESALIB_PANFROST if MESALIB_DRI_PANFROST || MESALIB_VULKAN_PANFROST select HOST_MESALIB_ASAHI if MESALIB_DRI_ASAHI || MESALIB_VULKAN_ASAHI + select HOST_MESALIB_IMAGINATION if MESALIB_VULKAN_IMAGINATION select HOST_MESON select HOST_MAKEDEPEND select HOST_SYSTEM_PYTHON3 @@ -19,6 +20,7 @@ menuconfig MESALIB select HOST_GLSLANG if MESALIB_VULKAN_SCREENSHOT select GCCLIBS select GCCLIBS_CXX + select LIBDISPLAY_INFO select LIBDRM select LIBVA if MESALIB_VA select WAYLAND if MESALIB_EGL_WAYLAND @@ -33,6 +35,7 @@ menuconfig MESALIB select LLVM if MESALIB_LLVM select LLVM_TARGET_TARGET if MESALIB_DRI_LLVMPIPE select LLVM_TARGET_AMDGPU if MESALIB_DRI_RADEONSI + select SPIRV_TOOLS if MESALIB_CLC select VULKAN_LOADER if MESALIB_DRI_ZINK select LM_SENSORS if MESALIB_LMSENSORS select XORGPROTO if MESALIB_GLX @@ -108,6 +111,10 @@ config MESALIB_DRI_FREEDRENO bool prompt "Freedreno" +config MESALIB_DRI_ETHOSU + bool + prompt "ethosu" + config MESALIB_DRI_ETNAVIV bool prompt "Etnaviv" @@ -137,6 +144,10 @@ config MESALIB_DRI_LIMA bool prompt "lima" +config MESALIB_DRI_ROCKET + bool + prompt "rocket" + config MESALIB_DRI_ZINK bool prompt "zink" @@ -280,6 +291,11 @@ config MESALIB_VULKAN_INTEL_HASVK select MESALIB_XMLCONFIG prompt "Intel (hasvk)" +config MESALIB_VULKAN_IMAGINATION + bool + select MESALIB_CLC + prompt "Imagination" + config MESALIB_VULKAN_FREEDRENO bool prompt "Freedreno (Turnip)" @@ -317,6 +333,10 @@ config MESALIB_VULKAN_GFXSTREAM comment "Vulkan layers" +config MESALIB_VULKAN_ANTI_LAG + bool + prompt "Anti-Lag layer" + config MESALIB_VULKAN_DEVICE_SELECT bool prompt "Device select layer" diff --git a/rules/mesalib.make b/rules/mesalib.make index 7dc00a5a0e8d..aa56e252e0ff 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION := 25.2.7 -MESALIB_MD5 := 0de4be70ff09523b3f4e1270cb0a69ef +MESALIB_VERSION := 25.3.1 +MESALIB_MD5 := 80c20978752fc15a792c41d482b04196 MESALIB := mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL := \ @@ -51,6 +51,7 @@ MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_RADEONSI) += radeonsi endif MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU) += nouveau MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_FREEDRENO)+= freedreno +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ETHOSU) += ethosu MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ETNAVIV) += etnaviv ifdef PTXCONF_ARCH_ARM_NEON MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_V3D) += v3d @@ -63,6 +64,7 @@ MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_LIMA) += lima ifdef PTXCONF_ARCH_X86 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_IRIS) += iris endif +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ROCKET) += rocket MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ZINK) += zink ifdef PTXCONF_ARCH_ARM64 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ASAHI) += asahi @@ -117,8 +119,10 @@ MESALIB_DRI_GALLIUM_LIBS-y = \ ,$(subst panfrost,panfrost panthor \ ,$(subst svga,vmwgfx \ ,$(subst virgl,virtio_gpu \ + ,$(subst ethosu, \ + ,$(subst rocket, \ ,$(MESALIB_GALLIUM_DRIVERS-y) \ - )))))) + )))))))) MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_VC1DEC) += vc1dec MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264DEC) += h264dec @@ -133,6 +137,7 @@ ifdef PTXCONF_ARCH_X86 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD) += amd MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL) += intel MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL_HASVK) += intel_hasvk +MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_IMAGINATION) += imagination endif ifdef PTXCONF_ARCH_ARM_NEON MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_BROADCOM) += broadcom @@ -151,8 +156,13 @@ ifdef PTXCONF_ARCH_LP64 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_GFXSTREAM) += gfxstream endif -MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(subst swrast,lvp,$(MESALIB_VULKAN_DRIVERS-y))) +MESALIB_VULKAN_LIBS-y = $(subst amd,radeon \ + ,$(subst swrast,lvp \ + ,$(subst imagination,powervr_mesa \ + ,$(MESALIB_VULKAN_DRIVERS-y) \ + ))) +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_ANTI_LAG) += anti-lag MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_DEVICE_SELECT) += device-select ifdef PTXCONF_ARCH_X86 MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_INTEL_NULLHW) += intel-nullhw @@ -191,6 +201,7 @@ MESALIB_CONF_OPT := \ -Damd-use-llvm=true \ -Damdgpu-virtio=false \ -Dandroid-libbacktrace=disabled \ + -Dandroid-libperfetto=disabled \ -Dandroid-strict=true \ -Dandroid-stub=false \ -Dbuild-aco-tests=false \ @@ -199,6 +210,7 @@ MESALIB_CONF_OPT := \ -Dcustom-shader-replacement= \ -Dd3d-drivers-path=/usr/lib/d3d \ -Ddatasources=auto \ + -Ddisplay-info=enabled \ -Ddraw-use-llvm=true \ -Ddri-drivers-path=/usr/lib/dri \ -Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \ @@ -218,7 +230,6 @@ MESALIB_CONF_OPT := \ -Dgallium-rusticl=false \ -Dgallium-rusticl-enable-drivers= \ -Dgallium-va=$(call ptx/endis, PTXCONF_MESALIB_VA)d \ - -Dgallium-vdpau=disabled \ -Dgallium-wgl-dll-name=libgallium_wgl \ -Dgbm=$(call ptx/endis, PTXCONF_MESALIB_GBM)d \ -Dgbm-backends-path= \ @@ -234,6 +245,7 @@ MESALIB_CONF_OPT := \ -Dhtml-docs=disabled \ -Dhtml-docs-path= \ -Dimagination-srv=false \ + -Dimagination-uscgen-devices=axe-1-16m \ -Dinstall-intel-gpu-tests=false \ -Dinstall-mesa-clc=false \ -Dinstall-precomp-compiler=false \ @@ -264,6 +276,7 @@ MESALIB_CONF_OPT := \ -Dshader-cache-max-size=1G \ -Dshared-llvm=enabled \ -Dspirv-to-dxil=false \ + -Dspirv-tools=$(call ptx/endis, PTXCONF_MESALIB_CLC)d \ -Dsplit-debug=disabled \ -Dsse2=true \ -Dstatic-libclc=[] \ @@ -273,7 +286,6 @@ MESALIB_CONF_OPT := \ -Dunversion-libgallium=false \ -Dva-libs-path=/usr/lib/dri \ -Dvalgrind=disabled \ - -Dvdpau-libs-path=/usr/lib/vdpau \ -Dvideo-codecs=$(subst $(space),$(comma),$(MESALIB_VIDEO_CODECS-y)) \ -Dvirtgpu_kumquat=false \ -Dvmware-mks-stats=false \ -- 2.47.3
