mesa3d 22.1.5 -> 22.2.1

2022-10-16 09:14:21 +08:00
parent a2e785bc94
commit 9028b5c617
67 changed files with 36 additions and 2 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -98,7 +98,8 @@ $(eval $(call define-redroid-prebuilt-etc,amdgpu.ids.redroid,,libdrm/amdgpu.ids,
 # libs with SOVERSION
 gbm_libs := libgbm.so.1
 glapi_libs := libglapi.so.0
-libs = $(gbm_libs) $(glapi_libs)
+expat_libs := libexpat.so.1
+libs = $(gbm_libs) $(glapi_libs) $(expat_libs)
 drm_libs := $(shell cd $(LOCAL_PATH)/prebuilts/$(TARGET_ARCH)/lib && find * -name 'libdrm*.so.*' -type l)
 libs += $(drm_libs)
 x264_libs := libx264.so.164
@@ -130,7 +131,7 @@ $(foreach lib,$(ffmpeg_libs),\
 libs := libEGL_mesa libGLESv1_CM_mesa libGLESv2_mesa
 $(foreach lib,$(libs),\
    $(eval $(call define-redroid-prebuilt-lib,$(lib),,egl/$(lib).so,egl,,\
-		$(dri_libs) $(llvm_libs) $(glapi_libs) $(drm_libs))))
+		$(dri_libs) $(llvm_libs) $(glapi_libs) $(drm_libs) $(expat_libs))))


 # Vulkan
--- a/prebuilts.mk
+++ b/prebuilts.mk
@@ -5,6 +5,7 @@ PRODUCT_PACKAGES += \
    libGLESv2_mesa \
    vulkan.radeon \
    vulkan.virtio \
+    vulkan.lvp \
    gralloc.cros \
    gralloc.gbm \
    ffmpeg \
--- a/prebuilts/aarch64/lib/dri/asahi_dri.so
+++ b/prebuilts/aarch64/lib/dri/asahi_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/aarch64/lib/dri/etnaviv_dri.so
+++ b/prebuilts/aarch64/lib/dri/etnaviv_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/aarch64/lib/dri/kms_swrast_dri.so
+++ b/prebuilts/aarch64/lib/dri/kms_swrast_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/aarch64/lib/dri/libgallium_dri.so
+++ b/prebuilts/aarch64/lib/dri/libgallium_dri.so
--- a/prebuilts/aarch64/lib/dri/libgallium_drv_video.so
+++ b/prebuilts/aarch64/lib/dri/libgallium_drv_video.so
--- a/prebuilts/aarch64/lib/dri/lima_dri.so
+++ b/prebuilts/aarch64/lib/dri/lima_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/aarch64/lib/dri/swrast_dri.so
+++ b/prebuilts/aarch64/lib/dri/swrast_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/aarch64/lib/dri/tegra_dri.so
+++ b/prebuilts/aarch64/lib/dri/tegra_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/aarch64/lib/dri/vmwgfx_dri.so
+++ b/prebuilts/aarch64/lib/dri/vmwgfx_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/aarch64/lib/dri/zink_dri.so
+++ b/prebuilts/aarch64/lib/dri/zink_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/aarch64/lib/hw/libvulkan_broadcom.so
+++ b/prebuilts/aarch64/lib/hw/libvulkan_broadcom.so
--- a/prebuilts/aarch64/lib/hw/libvulkan_freedreno.so
+++ b/prebuilts/aarch64/lib/hw/libvulkan_freedreno.so
--- a/prebuilts/aarch64/lib/hw/libvulkan_lvp.so
+++ b/prebuilts/aarch64/lib/hw/libvulkan_lvp.so
--- a/prebuilts/aarch64/lib/hw/libvulkan_panfrost.so
+++ b/prebuilts/aarch64/lib/hw/libvulkan_panfrost.so
--- a/prebuilts/aarch64/lib/hw/libvulkan_powervr_mesa.so
+++ b/prebuilts/aarch64/lib/hw/libvulkan_powervr_mesa.so
--- a/prebuilts/aarch64/lib/hw/libvulkan_radeon.so
+++ b/prebuilts/aarch64/lib/hw/libvulkan_radeon.so
--- a/prebuilts/aarch64/lib/hw/libvulkan_virtio.so
+++ b/prebuilts/aarch64/lib/hw/libvulkan_virtio.so
--- a/prebuilts/aarch64/lib/libexpat.so
+++ b/prebuilts/aarch64/lib/libexpat.so
@@ -0,0 +1 @@
+libexpat.so.1
--- a/prebuilts/aarch64/lib/libexpat.so.1
+++ b/prebuilts/aarch64/lib/libexpat.so.1
@@ -0,0 +1 @@
+libexpat.so.1.6.7
--- a/prebuilts/aarch64/lib/libexpat.so.1.6.7
+++ b/prebuilts/aarch64/lib/libexpat.so.1.6.7
--- a/prebuilts/arm/lib/dri/asahi_dri.so
+++ b/prebuilts/arm/lib/dri/asahi_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/arm/lib/dri/etnaviv_dri.so
+++ b/prebuilts/arm/lib/dri/etnaviv_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/arm/lib/dri/kms_swrast_dri.so
+++ b/prebuilts/arm/lib/dri/kms_swrast_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/arm/lib/dri/libgallium_dri.so
+++ b/prebuilts/arm/lib/dri/libgallium_dri.so
--- a/prebuilts/arm/lib/dri/libgallium_drv_video.so
+++ b/prebuilts/arm/lib/dri/libgallium_drv_video.so
--- a/prebuilts/arm/lib/dri/lima_dri.so
+++ b/prebuilts/arm/lib/dri/lima_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/arm/lib/dri/swrast_dri.so
+++ b/prebuilts/arm/lib/dri/swrast_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/arm/lib/dri/tegra_dri.so
+++ b/prebuilts/arm/lib/dri/tegra_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/arm/lib/dri/vmwgfx_dri.so
+++ b/prebuilts/arm/lib/dri/vmwgfx_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/arm/lib/dri/zink_dri.so
+++ b/prebuilts/arm/lib/dri/zink_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/arm/lib/hw/libvulkan_broadcom.so
+++ b/prebuilts/arm/lib/hw/libvulkan_broadcom.so
--- a/prebuilts/arm/lib/hw/libvulkan_freedreno.so
+++ b/prebuilts/arm/lib/hw/libvulkan_freedreno.so
--- a/prebuilts/arm/lib/hw/libvulkan_lvp.so
+++ b/prebuilts/arm/lib/hw/libvulkan_lvp.so
--- a/prebuilts/arm/lib/hw/libvulkan_panfrost.so
+++ b/prebuilts/arm/lib/hw/libvulkan_panfrost.so
--- a/prebuilts/arm/lib/hw/libvulkan_radeon.so
+++ b/prebuilts/arm/lib/hw/libvulkan_radeon.so
--- a/prebuilts/arm/lib/hw/libvulkan_virtio.so
+++ b/prebuilts/arm/lib/hw/libvulkan_virtio.so
--- a/prebuilts/arm/lib/libexpat.so
+++ b/prebuilts/arm/lib/libexpat.so
@@ -0,0 +1 @@
+libexpat.so.1
--- a/prebuilts/arm/lib/libexpat.so.1
+++ b/prebuilts/arm/lib/libexpat.so.1
@@ -0,0 +1 @@
+libexpat.so.1.6.7
--- a/prebuilts/arm/lib/libexpat.so.1.6.7
+++ b/prebuilts/arm/lib/libexpat.so.1.6.7
--- a/prebuilts/x86/lib/dri/kms_swrast_dri.so
+++ b/prebuilts/x86/lib/dri/kms_swrast_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/x86/lib/dri/libgallium_dri.so
+++ b/prebuilts/x86/lib/dri/libgallium_dri.so
--- a/prebuilts/x86/lib/dri/libgallium_drv_video.so
+++ b/prebuilts/x86/lib/dri/libgallium_drv_video.so
--- a/prebuilts/x86/lib/dri/swrast_dri.so
+++ b/prebuilts/x86/lib/dri/swrast_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/x86/lib/dri/vmwgfx_dri.so
+++ b/prebuilts/x86/lib/dri/vmwgfx_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/x86/lib/dri/zink_dri.so
+++ b/prebuilts/x86/lib/dri/zink_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/x86/lib/hw/libvulkan_intel.so
+++ b/prebuilts/x86/lib/hw/libvulkan_intel.so
--- a/prebuilts/x86/lib/hw/libvulkan_lvp.so
+++ b/prebuilts/x86/lib/hw/libvulkan_lvp.so
--- a/prebuilts/x86/lib/hw/libvulkan_radeon.so
+++ b/prebuilts/x86/lib/hw/libvulkan_radeon.so
--- a/prebuilts/x86/lib/hw/libvulkan_virtio.so
+++ b/prebuilts/x86/lib/hw/libvulkan_virtio.so
--- a/prebuilts/x86/lib/libexpat.so
+++ b/prebuilts/x86/lib/libexpat.so
@@ -0,0 +1 @@
+libexpat.so.1
--- a/prebuilts/x86/lib/libexpat.so.1
+++ b/prebuilts/x86/lib/libexpat.so.1
@@ -0,0 +1 @@
+libexpat.so.1.6.7
--- a/prebuilts/x86/lib/libexpat.so.1.6.7
+++ b/prebuilts/x86/lib/libexpat.so.1.6.7
--- a/prebuilts/x86_64/lib/dri/kms_swrast_dri.so
+++ b/prebuilts/x86_64/lib/dri/kms_swrast_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/x86_64/lib/dri/libgallium_dri.so
+++ b/prebuilts/x86_64/lib/dri/libgallium_dri.so
--- a/prebuilts/x86_64/lib/dri/libgallium_drv_video.so
+++ b/prebuilts/x86_64/lib/dri/libgallium_drv_video.so
--- a/prebuilts/x86_64/lib/dri/swrast_dri.so
+++ b/prebuilts/x86_64/lib/dri/swrast_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/x86_64/lib/dri/vmwgfx_dri.so
+++ b/prebuilts/x86_64/lib/dri/vmwgfx_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/x86_64/lib/dri/zink_dri.so
+++ b/prebuilts/x86_64/lib/dri/zink_dri.so
@@ -0,0 +1 @@
+libgallium_dri.so
--- a/prebuilts/x86_64/lib/hw/libvulkan_intel.so
+++ b/prebuilts/x86_64/lib/hw/libvulkan_intel.so
--- a/prebuilts/x86_64/lib/hw/libvulkan_lvp.so
+++ b/prebuilts/x86_64/lib/hw/libvulkan_lvp.so
--- a/prebuilts/x86_64/lib/hw/libvulkan_radeon.so
+++ b/prebuilts/x86_64/lib/hw/libvulkan_radeon.so
--- a/prebuilts/x86_64/lib/hw/libvulkan_virtio.so
+++ b/prebuilts/x86_64/lib/hw/libvulkan_virtio.so
--- a/prebuilts/x86_64/lib/libexpat.so
+++ b/prebuilts/x86_64/lib/libexpat.so
@@ -0,0 +1 @@
+libexpat.so.1
--- a/prebuilts/x86_64/lib/libexpat.so.1
+++ b/prebuilts/x86_64/lib/libexpat.so.1
@@ -0,0 +1 @@
+libexpat.so.1.6.7
--- a/prebuilts/x86_64/lib/libexpat.so.1.6.7
+++ b/prebuilts/x86_64/lib/libexpat.so.1.6.7