From 01737313e51382c1af5f3ddeb1a7a20666dc9bbb Mon Sep 17 00:00:00 2001 From: Jason Macnak Date: Thu, 28 May 2026 11:50:03 -0700 Subject: [PATCH] Fix the gpu mode ordering in the non-opt'ing path https://github.com/google/android-cuttlefish/pull/2611 was incorrect. The previous behavior was to prefer `--gpu_mode=gfxstream` over `--gpu_mode=guest_swiftshader` prior to the Jolt changes. Bug: b/513229182 --- .../host/commands/assemble_cvd/graphics_flags.cc | 2 +- e2etests/cvd/graphics_detector_tests/main_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc index f488b6b78a5..a813d6063cd 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc @@ -456,8 +456,8 @@ std::vector GetGpuModeCandidates(const GuestConfig& guest_config) { gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngleHostLavapipe); gpu_mode_candidates.push_back(GpuMode::GuestSwiftshader); } else { - gpu_mode_candidates.push_back(GpuMode::GuestSwiftshader); gpu_mode_candidates.push_back(GpuMode::Gfxstream); + gpu_mode_candidates.push_back(GpuMode::GuestSwiftshader); gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngle); gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngleHostSwiftshader); gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngleHostLavapipe); diff --git a/e2etests/cvd/graphics_detector_tests/main_test.go b/e2etests/cvd/graphics_detector_tests/main_test.go index 2cedfa7191b..3cffec9a4b6 100644 --- a/e2etests/cvd/graphics_detector_tests/main_test.go +++ b/e2etests/cvd/graphics_detector_tests/main_test.go @@ -44,15 +44,15 @@ func TestLaunchingWithAutoEnablesGfxstream(t *testing.T) { if err != nil { t.Fatalf("failed to get EGL sysprop: %w", err) } - if gl_driver != "angle" { - t.Errorf(`"ro.hardware.egl" was "%s"; expected "angle"`, gl_driver) + if gl_driver != "emulation" { + t.Errorf(`"ro.hardware.egl" was "%s"; expected "emulation"`, gl_driver) } vk_driver, err := c.GetSyspropString("ro.hardware.vulkan") if err != nil { t.Fatalf("failed to get Vulkan sysprop: %w", err) } - if vk_driver != "pastel" { - t.Errorf(`"ro.hardware.vulkan" was "%s"; expected "pastel"`, vk_driver) + if vk_driver != "ranchu" { + t.Errorf(`"ro.hardware.vulkan" was "%s"; expected "ranchu"`, vk_driver) } }