Skip to content

Commit 76bf53f

Browse files
committed
Fix the gpu mode ordering in the non-opt'ing path
#2502 was incorrect. The previous behavior was to prefer `--gpu_mode=gfxstream` over `--gpu_mode=guest_swiftshader` prior to the Jolt changes. Bug: b/513229182
1 parent ecba083 commit 76bf53f

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,9 @@ std::vector<GpuMode> GetGpuModeCandidates(const GuestConfig& guest_config) {
456456
gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngleHostLavapipe);
457457
gpu_mode_candidates.push_back(GpuMode::GuestSwiftshader);
458458
} else {
459-
gpu_mode_candidates.push_back(GpuMode::GuestSwiftshader);
460459
gpu_mode_candidates.push_back(GpuMode::Gfxstream);
461460
gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngle);
461+
gpu_mode_candidates.push_back(GpuMode::GuestSwiftshader);
462462
gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngleHostSwiftshader);
463463
gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngleHostLavapipe);
464464
}

e2etests/cvd/graphics_detector_tests/main_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestLaunchingWithAutoEnablesGfxstream(t *testing.T) {
5252
if err != nil {
5353
t.Fatalf("failed to get Vulkan sysprop: %w", err)
5454
}
55-
if vk_driver != "pastel" {
56-
t.Errorf(`"ro.hardware.vulkan" was "%s"; expected "pastel"`, vk_driver)
55+
if vk_driver != "ranchu" {
56+
t.Errorf(`"ro.hardware.vulkan" was "%s"; expected "ranchu"`, vk_driver)
5757
}
5858
}

0 commit comments

Comments
 (0)