From 21bac9340695c5b10602686c6a0d3e2a025e13a3 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sun, 15 Mar 2026 15:22:37 -0700 Subject: [PATCH] lvp: raise LVP_MAX_PLANE_COUNT to 3 and update ci expectations Reviewed-by: Lucas Fryzek Part-of: --- .../lavapipe/ci/lvp-android-angle-android-cts-skips.txt | 6 ------ src/gallium/frontends/lavapipe/lvp_private.h | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-skips.txt b/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-skips.txt index 9a5d9c5f1c6..f85c3a74ae4 100644 --- a/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-skips.txt +++ b/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-skips.txt @@ -11,17 +11,11 @@ x86_64 CtsGraphicsTestCases android.graphics.fonts.SystemFontsTest#testAvailable # New flakes with Android 16 x86_64 CtsGraphicsTestCases android.graphics.cts.DynamicColorsTest -# Fail because LVP_MAX_PLANE_COUNT is limited at 1. Will crash if raised up. -x86_64 CtsGraphicsTestCases android.graphics.cts.CameraGpuTest#testCameraImageCaptureAndRendering -x86_64 CtsGraphicsTestCases android.graphics.cts.CameraVulkanGpuTest#testCameraImportAndRendering -x86_64 CtsGraphicsTestCases android.graphics.cts.MediaVulkanGpuTest#testMediaImportAndRendering - ### CtsSkQPTestCases # Failures x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_BulkTextureRectTest x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_ES2BlendWithNoTexture -x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_VkYCbcrSampler_DrawImageWithYcbcrSampler # New failures with VK_EXT_blend_operation_advanced x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_BlendRequiringDstReadWithLargeCoordinates diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h index 54d58c1e03b..163aa81812d 100644 --- a/src/gallium/frontends/lavapipe/lvp_private.h +++ b/src/gallium/frontends/lavapipe/lvp_private.h @@ -106,8 +106,7 @@ extern "C" { #define MAX_PER_STAGE_DESCRIPTOR_UNIFORM_BLOCKS 8 #define MAX_DGC_STREAMS 16 #define MAX_DGC_TOKENS 16 -/* Currently lavapipe does not support more than 1 image plane */ -#define LVP_MAX_PLANE_COUNT 1 +#define LVP_MAX_PLANE_COUNT 3 #define LVP_MAX_TLAS_DEPTH 24 #define LVP_MAX_BLAS_DEPTH 29