diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index e1faea95d5..a7af0af052 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -59,6 +59,7 @@ menuconfig BR2_PACKAGE_MESA3D_OPENCL BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS || \ BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL || \ BR2_PACKAGE_MESA3D_VULKAN_DRIVER_IMAGINATION || \ + BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST || \ (BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS && \ BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER) select BR2_PACKAGE_LLVM_RTTI @@ -365,6 +366,19 @@ comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ !BR2_TOOLCHAIN_USES_GLIBC +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST + bool "Vulkan panfrost driver" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence + depends on BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_LLVM_RTTI if BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + help + Vulkan panfrost driver. + +comment "panfrost vulkan needs llvm" + depends on !BR2_PACKAGE_MESA3D_LLVM + config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST bool "Vulkan swrast driver" depends on BR2_PACKAGE_MESA3D_LLVM diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 42693ce928..027ddf5133 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -131,6 +131,8 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ZINK) += zink MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM) += broadcom MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_IMAGINATION) += imagination MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST) += panfrost +HOST_MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST) += panfrost MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST) += swrast MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_VIRTIO) += virtio @@ -284,7 +286,7 @@ else MESA3D_CONF_OPTS += -Dglvnd=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) +ifneq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST)$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST),) HOST_MESA3D_TOOLS += panfrost endif @@ -315,7 +317,7 @@ HOST_MESA3D_DEPENDENCIES = \ host-python-pyyaml \ host-spirv-tools -ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) +ifneq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST)$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST),) HOST_MESA3D_INSTALL_PANFROST_COMPILE = \ $(INSTALL) -D -m 0755 $(@D)/buildroot-build/src/panfrost/clc/panfrost_compile $(HOST_DIR)/bin/panfrost_compile endif